Merge pull request #362 from ytai/BumpGradle-8.7

Gradle 8.7
ytai · May 10, 2024 · cf50a96 · cf50a96
2 parents 053757f + f0250fe
commit cf50a96
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 11 deletions.
diff --git a/IOIOBridge/build.gradle b/IOIOBridge/build.gradle
@@ -6,8 +6,8 @@ task distJar(type: OneJar) {
 }
 
 task zip(type: Zip, dependsOn: distJar) {
-    baseName = 'IOIOBridge'
-    version = '0103'
+    archiveBaseName = 'IOIOBridge'
+    archiveVersion = '0103'
 
     from distJar
     from('ioiobridge', 'ioiobridge.bat')

diff --git a/IOIODude/build.gradle b/IOIODude/build.gradle
@@ -6,8 +6,8 @@ task distJar(type: OneJar) {
 }
 
 task zip(type: Zip, dependsOn: distJar) {
-    baseName = 'IOIODude'
-    version = '0103'
+    archiveBaseName = 'IOIODude'
+    archiveVersion = '0103'
 
     from distJar
     from('ioiodude', 'ioiodude.bat')

diff --git a/IOIOLibCore/build.gradle b/IOIOLibCore/build.gradle
@@ -13,12 +13,12 @@ javadoc {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 

diff --git a/IOIOLibPC/build.gradle b/IOIOLibPC/build.gradle
@@ -6,12 +6,12 @@ javadoc {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 

diff --git a/applications/HelloIOIO/build.gradle b/applications/HelloIOIO/build.gradle
@@ -16,7 +16,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/applications/HolidayIOIO/build.gradle b/applications/HolidayIOIO/build.gradle
@@ -15,6 +15,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/applications/IOIOManager/build.gradle b/applications/IOIOManager/build.gradle
@@ -16,6 +16,11 @@ android {
         testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     buildTypes {
         release {
             minifyEnabled true

diff --git a/applications/IOIOSimpleApp/build.gradle b/applications/IOIOSimpleApp/build.gradle
@@ -15,6 +15,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.github.hannesa2:gradle-one-jar:1.6"
+        classpath "com.github.hannesa2:gradle-one-jar:1.7-beta3"
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists