Шаблон переведён на gradle 9 и плагин ncore-gradle 4
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,4 +7,5 @@ gen
|
||||
.idea/misc.xml
|
||||
ncore-properties-local.xml
|
||||
*.iml
|
||||
/out
|
||||
/out
|
||||
dependencies.gradle
|
20
build.gradle
20
build.gradle
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'nu.studer.credentials' version('1.0.4')
|
||||
id 'nu.studer.credentials' version('1.0.7')
|
||||
id 'idea'
|
||||
id 'eclipse'
|
||||
id 'application'
|
||||
@ -9,7 +9,14 @@ plugins {
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
targetCompatibility = 1.8
|
||||
java {
|
||||
withSourcesJar()
|
||||
sourceCompatibility = project.properties.'java.version' ?: 17
|
||||
}
|
||||
|
||||
test {
|
||||
failOnNoDiscoveredTests = false
|
||||
}
|
||||
|
||||
ncore {
|
||||
coreVersion = project.properties.'biz.redsoft.ncore.version'
|
||||
@ -34,12 +41,11 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'javax.servlet:javax.servlet-api:3.1.0'
|
||||
testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
testCompileOnly '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-jasper:9.0.76'
|
||||
runtimeClasspath files(ncoreGenerateControlDataJar)
|
||||
runtimeClasspath files(genJar)
|
||||
runtimeOnly files(ncoreGenerateControlDataJar)
|
||||
runtimeOnly files(genJar)
|
||||
}
|
||||
|
||||
|
||||
@ -70,7 +76,7 @@ gradle.services.get(LoggingOutputInternal).addStandardErrorListener(new Standard
|
||||
})
|
||||
// --------------------- BUILD LOG SETTINGS ----------------------
|
||||
|
||||
run.args = ['client',
|
||||
run.args += ['client',
|
||||
'-config', 'ncore-properties.xml',
|
||||
'-config', 'ncore-properties-local.xml']
|
||||
|
||||
|
@ -1,15 +1,10 @@
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven {
|
||||
def repo = project.properties.'biz.redsoft.public.repo'
|
||||
url repo
|
||||
if (repo.contains("http:/"))
|
||||
allowInsecureProtocol = true
|
||||
if (project.credentials.user != null && project.credentials.password != null) {
|
||||
credentials {
|
||||
username project.credentials.user
|
||||
password project.credentials.password
|
||||
}
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
implementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
|
||||
updates("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:updates")
|
||||
codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-util-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-cryptoapisec-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-jna-JDK17:1.10.339.68")
|
||||
codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:gen")
|
||||
testImplementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:tests")
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
biz.redsoft.ncore.version=1.10.339.9
|
||||
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
|
||||
biz.redsoft.ncore.version=1.10.339.68
|
||||
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError
|
||||
org.gradle.daemon=false
|
||||
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.private.repo=https://ncore-repo.red-soft.ru/repository/ncore
|
||||
biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncorez
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
Reference in New Issue
Block a user