v0.8.33-SNAPSHOT - upd deps, fix fatJar Main class
This commit is contained in:
parent
2ea30ab6c2
commit
3dff3c1631
3 changed files with 22 additions and 20 deletions
37
build.gradle
37
build.gradle
|
@ -1,5 +1,5 @@
|
|||
buildscript {
|
||||
ext.kotlin_version = '1.5.21'
|
||||
ext.kotlin_version = '1.6.10'
|
||||
ext.CI_PROJECT_ID = System.env.CI_PROJECT_ID
|
||||
|
||||
repositories { mavenCentral() }
|
||||
|
@ -18,18 +18,20 @@ apply plugin: 'kotlinx-serialization'
|
|||
|
||||
|
||||
group = 'org.domaindrivenarchitecture.provs'
|
||||
version = '0.8.32'
|
||||
version = '0.8.33-SNAPSHOT'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(11)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
test {
|
||||
// set properties for the tests
|
||||
def propertiesForTests = ["testdockerwithoutsudo"]
|
||||
|
@ -55,9 +57,6 @@ compileJava.options.debugOptions.debugLevel = "source,lines,vars"
|
|||
compileTestFixturesJava.options.debugOptions.debugLevel = "source,lines,vars"
|
||||
compileTestJava.options.debugOptions.debugLevel = "source,lines,vars"
|
||||
|
||||
sourceCompatibility = 1.11
|
||||
targetCompatibility = 1.11
|
||||
|
||||
// https://stackoverflow.com/questions/21904269/configure-gradle-to-publish-sources-and-javadoc
|
||||
java {
|
||||
withSourcesJar()
|
||||
|
@ -69,22 +68,22 @@ dependencies {
|
|||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.1"
|
||||
|
||||
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.2"
|
||||
implementation 'com.charleskorn.kaml:kaml:0.35.2'
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.4"
|
||||
implementation 'com.charleskorn.kaml:kaml:0.38.0'
|
||||
|
||||
implementation group: 'com.hierynomus', name: 'sshj', version: '0.31.0'
|
||||
implementation group: 'com.hierynomus', name: 'sshj', version: '0.32.0'
|
||||
|
||||
api "org.slf4j:slf4j-api:1.7.32"
|
||||
api "ch.qos.logback:logback-classic:1.2.5"
|
||||
api "ch.qos.logback:logback-core:1.2.5"
|
||||
api "ch.qos.logback:logback-classic:1.2.9"
|
||||
api "ch.qos.logback:logback-core:1.2.9"
|
||||
|
||||
testFixturesApi group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
|
||||
testImplementation("io.mockk:mockk:1.12.0")
|
||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
|
||||
testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.8.2'
|
||||
testImplementation("io.mockk:mockk:1.12.1")
|
||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
|
||||
}
|
||||
|
||||
|
||||
|
@ -100,7 +99,7 @@ task fatJarLatest(type: Jar) {
|
|||
manifest {
|
||||
attributes 'Implementation-Title': 'Fatjar of provs',
|
||||
'Implementation-Version': project.version,
|
||||
'Main-Class': 'org.domaindrivenarchitecture.provs.workplace.application.CliKt'
|
||||
'Main-Class': 'org.domaindrivenarchitecture.provs.workplace.application.CliWorkplaceKt'
|
||||
}
|
||||
with jar
|
||||
archiveFileName = 'provs.jar'
|
||||
|
|
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.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -34,6 +34,9 @@
|
|||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>INFO</level>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<logger name="net.schmizz" level="ERROR">
|
||||
|
|
Loading…
Reference in a new issue