From 6fe10f1b2a229097b0cb50d498890dc350809b6b Mon Sep 17 00:00:00 2001 From: jdrueckert Date: Sun, 30 Jul 2023 22:11:15 +0200 Subject: [PATCH] build: bump gradle 6.9.2 -> 8.2 (#9) * adjust compatibility settings * classifier got renamed to archiveClassifier --- build.gradle | 10 ++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 7cc985a..e30c33d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,10 @@ group = 'org.terasology' archivesBaseName = 'splash-screen' // for local jar files -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +tasks.compileJava { + java.sourceCompatibility JavaVersion.VERSION_1_8 + java.targetCompatibility JavaVersion.VERSION_1_8 +} // We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on repositories { @@ -70,13 +72,13 @@ dependencies { task sourceJar(type: Jar) { description = "Create a JAR with all sources" from sourceSets.main.allSource - classifier = 'sources' + archiveClassifier = 'sources' } task javadocJar(type: Jar, dependsOn: javadoc) { description = "Create a JAR with the JavaDoc for the java sources" from javadoc.destinationDir - classifier = 'javadoc' + archiveClassifier = 'javadoc' } // Define the artifacts we want to publish (the .pom will also be included since the Maven plugin is active) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6499169..b93c46a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists