Skip to content

Commit 6abcaad

Browse files
committedOct 22, 2023
Update to gradle 8.4
1 parent 6390689 commit 6abcaad

File tree

5 files changed

+205
-151
lines changed

5 files changed

+205
-151
lines changed
 

‎build.gradle

+8-21
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@ dependencies {
5454

5555
}
5656

57-
task sourcesJar(type: Jar, dependsOn: classes) {
58-
classifier = 'sources'
57+
tasks.register('sourcesJar', Jar) {
58+
dependsOn classes
59+
archiveClassifier.set('sources')
5960
from sourceSets.main.allSource
6061
}
6162

62-
task javadocJar(type: Jar, dependsOn: javadoc) {
63-
classifier = 'javadoc'
64-
from javadoc.destinationDir
65-
}
66-
6763
publishing {
6864
publications {
6965
mavenJava(MavenPublication) {
@@ -80,25 +76,16 @@ publishing {
8076
}
8177

8278
credentials {
83-
username = project.hasProperty("mavenUser") ? project.property("mavenUser") : ""
84-
password = project.hasProperty("mavenPassword") ? project.property("mavenPassword") : ""
79+
username = project.hasProperty("mavenUser") ? project.property("mavenUser") : System.getenv("MAVEN_USERNAME")
80+
password = project.hasProperty("mavenPassword") ? project.property("mavenPassword") : System.getenv("MAVEN_PASSWORD")
8581
}
8682
}
8783
}
8884
}
8985

90-
artifacts {
91-
archives sourcesJar
92-
archives javadocJar
93-
}
94-
9586
compileKotlin {
96-
kotlinOptions {
97-
jvmTarget = "1.8"
98-
}
87+
kotlinOptions.jvmTarget = "1.8"
9988
}
10089
compileTestKotlin {
101-
kotlinOptions {
102-
jvmTarget = "1.8"
103-
}
104-
}
90+
kotlinOptions.jvmTarget = "1.8"
91+
}

‎gradle/wrapper/gradle-wrapper.jar

4.24 KB
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)
Please sign in to comment.