Merge pull request #164 from dmytrodanylyk/Java17

Java 17
dmytrodanylyk · Oct 6, 2023 · 316ac86 · 316ac86
2 parents 42bb805 + 8591598
commit 316ac86
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
 
       - name: Install Android SDK
         uses: malinskiy/action-android/install-sdk@release/0.1.4

diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        java_version: [ 11 ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: [ 11 ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/jitpack.yml b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
-  - openjdk11
+  - openjdk17
 install:
   - ./gradlew :library:build :library:publishToMavenLocal -x :library:test
   - find . -name "*.aar"
diff --git a/library/build.gradle b/library/build.gradle
@@ -16,6 +16,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
     namespace 'com.dd.circular.progress.button'
 }
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -15,8 +15,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
     namespace 'com.dd.sample'
-
 }
 
 dependencies {