Шаблон переведён на gradle 9 и плагин ncore-gradle 4

This commit is contained in:
2025-09-19 15:42:19 +03:00
parent c6c7da53fa
commit 079c5a8074
5 changed files with 29 additions and 27 deletions

3
.gitignore vendored
View File

@ -7,4 +7,5 @@ gen
.idea/misc.xml .idea/misc.xml
ncore-properties-local.xml ncore-properties-local.xml
*.iml *.iml
/out /out
dependencies.gradle

View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'nu.studer.credentials' version('1.0.4') id 'nu.studer.credentials' version('1.0.7')
id 'idea' id 'idea'
id 'eclipse' id 'eclipse'
id 'application' id 'application'
@ -9,7 +9,14 @@ plugins {
id 'maven-publish' id 'maven-publish'
} }
targetCompatibility = 1.8 java {
withSourcesJar()
sourceCompatibility = project.properties.'java.version' ?: 17
}
test {
failOnNoDiscoveredTests = false
}
ncore { ncore {
coreVersion = project.properties.'biz.redsoft.ncore.version' coreVersion = project.properties.'biz.redsoft.ncore.version'
@ -34,12 +41,11 @@ repositories {
} }
dependencies { dependencies {
implementation 'javax.servlet:javax.servlet-api:3.1.0' testCompileOnly 'org.junit.jupiter:junit-jupiter:5.8.2'
testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2'
testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76' testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76'
testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76' testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76'
runtimeClasspath files(ncoreGenerateControlDataJar) runtimeOnly files(ncoreGenerateControlDataJar)
runtimeClasspath files(genJar) runtimeOnly files(genJar)
} }
@ -70,7 +76,7 @@ gradle.services.get(LoggingOutputInternal).addStandardErrorListener(new Standard
}) })
// --------------------- BUILD LOG SETTINGS ---------------------- // --------------------- BUILD LOG SETTINGS ----------------------
run.args = ['client', run.args += ['client',
'-config', 'ncore-properties.xml', '-config', 'ncore-properties.xml',
'-config', 'ncore-properties-local.xml'] '-config', 'ncore-properties-local.xml']

View File

@ -1,15 +1,10 @@
repositories { dependencies {
mavenLocal() implementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
maven { updates("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:updates")
def repo = project.properties.'biz.redsoft.public.repo' codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
url repo implementation("biz.redsoft.ncore:ncore-util-JDK17:1.10.339.68")
if (repo.contains("http:/")) implementation("biz.redsoft.ncore:ncore-cryptoapisec-JDK17:1.10.339.68")
allowInsecureProtocol = true implementation("biz.redsoft.ncore:ncore-jna-JDK17:1.10.339.68")
if (project.credentials.user != null && project.credentials.password != null) { codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:gen")
credentials { testImplementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:tests")
username project.credentials.user
password project.credentials.password
}
}
}
} }

View File

@ -1,7 +1,7 @@
biz.redsoft.ncore.version=1.10.339.9 biz.redsoft.ncore.version=1.10.339.68
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.daemon=false org.gradle.daemon=false
org.gradle.configureondemand=true org.gradle.configureondemand=true
pluginVersion=3.0.96 pluginVersion=4.0.18
biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public
biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncore biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncorez

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists