Merge pull request #266 from uhooi/feature/bump_as_to_flamingo

Bump AS from Electric Eel to Flamingo
uhooi · Jul 26, 2023 · 20f25af · 20f25af
2 parents fdb1b1c + 6b91019
commit 20f25af
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,6 +54,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - uses: ./.github/workflows/templates/setup-android
+
     - name: Run Inspection
       run: ./gradlew lint
 
@@ -78,6 +80,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - uses: ./.github/workflows/templates/setup-android
+
     - name: Lint with detekt
       run: ./gradlew detekt
 
@@ -96,6 +100,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - uses: ./.github/workflows/templates/setup-android
+
     - name: Install ktlint
       run: |
         curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.42.1/ktlint

diff --git a/.github/workflows/templates/setup-android/action.yml b/.github/workflows/templates/setup-android/action.yml
@@ -4,11 +4,11 @@ description: "Install dependencies for Android"
 runs:
   using: "composite"
   steps:
-  - name: Setup JDK 11
+  - name: Setup JDK 17
     uses: actions/setup-java@v3
     with:
       distribution: 'zulu'
-      java-version: '11'
+      java-version: '17'
 
   - uses: actions/cache@v3
     with:

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ You can develop this project.
 
 ### Environment
 
-- Android Studio: Electric Eel | 2022.1.1 Patch 1
+- Android Studio: Flamingo | 2022.2.1 Patch 2
 
 ### Configuration
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -48,12 +48,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     testOptions {

diff --git a/app/src/main/java/com/theuhooi/uhooipicbook/ui/MainActivity.kt b/app/src/main/java/com/theuhooi/uhooipicbook/ui/MainActivity.kt
@@ -42,14 +42,14 @@ class MainActivity : AppCompatActivity() {
                     ColorDrawable(
                         MaterialColors.getColor(
                             this,
-                            R.attr.colorPrimary,
+                            androidx.appcompat.R.attr.colorPrimary,
                             "colorPrimary is not set in the current theme"
                         )
                     )
                 )
                 window.statusBarColor = MaterialColors.getColor(
                     this,
-                    R.attr.colorPrimaryVariant,
+                    com.google.android.material.R.attr.colorPrimaryVariant,
                     "colorPrimaryVariant is not set in the current theme"
                 )
             }

diff --git a/gradle.properties b/gradle.properties
@@ -22,3 +22,6 @@ kotlin.code.style=official
 
 org.gradle.caching=true
 org.gradle.configureondemand=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,11 +44,11 @@ kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "ko
 leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" }
 leakcanary-instrumentation = { group = "com.squareup.leakcanary", name = "leakcanary-android-instrumentation", version.ref = "leakcanary" }
 material = { group = "com.google.android.material", name = "material", version = "1.8.0" }
-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.6.1" }
+robolectric = { group = "org.robolectric", name = "robolectric", version = "4.10.3" }
 timber = { group = "com.jakewharton.timber", name = "timber", version = "5.0.1" }
 
 [plugins]
-android-application = { id = "com.android.application", version = "7.4.2" }
+android-application = { id = "com.android.application", version = "8.0.2" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.17.0" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.4" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }

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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip