Merge pull request #14 from futuredapp/feature/update-gradle

Update gradle plugin & Java 17
futuredapp · Jul 11, 2023 · 7f3e048 · 7f3e048
2 parents bb835b8 + db821cc
commit 7f3e048
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/enterprise.yml b/.github/workflows/enterprise.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Run check and Assemble APK
         shell: bash
         run: ./gradlew lintCheck assembleDevEnterprise

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Run LintCheck
         shell: bash
         run: ./gradlew lintCheck

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -42,16 +42,17 @@ android.apply {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions.apply {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     composeOptions {
@@ -137,7 +138,7 @@ android.apply {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 dependencies {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -3,7 +3,7 @@
 object Versions {
 
     // gradle
-    const val androidGradlePlugin = "7.4.1"
+    const val androidGradlePlugin = "8.0.2"
 
     // plugins
     const val detekt = "1.22.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip