Update gradle, dependencies, SDK

bitfireAT · Oct 14, 2024 · 47404e9 · 47404e9
1 parent 1b42c58
commit 47404e9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/build-kdoc.yml b/.github/workflows/build-kdoc.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v3
 
       - name: Build KDoc

diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v3
 
       - name: Check
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v3
 
       - name: Enable KVM group perms

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@
 *.class
 
 # Generated files
+.kotlin/
 bin/
 gen/
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-agp = "8.5.2"
+agp = "8.7.0"
 androidx-annotation = "1.8.2"
 androidx-test-runner = "1.6.2"
 androidx-rest-rules = "1.6.1"
 desugar = "2.1.2"
 dokka = "1.9.20"
 ezvcard = "0.12.1"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 junit = "4.13.2"
 
 [libraries]

diff --git 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-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
-  - openjdk17
+  - openjdk21
 before_install:
-  - sdk install java 17.0.1-open
-  - sdk use java 17.0.1-open
+  - sdk install java 21.0.4-tem
+  - sdk use java 21.0.4-tem
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -19,13 +19,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-
         isCoreLibraryDesugaringEnabled = true
     }
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 
     buildTypes {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
     *.class
     # Generated files
+    .kotlin/
     bin/
     gen/
@@ Expand Down @@