Upgrade gradle and AGP versions + fixing errors that came up

worker8 · worker8 · commit 42e88f7901d3 · 2023-10-28T23:57:15.000+09:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,8 +8,12 @@ plugins {
 }
 
 android {
+    namespace = "com.worker8.androiddevnews"
     compileSdk = 33
     buildToolsVersion = "30.0.3"
+    buildFeatures {
+        buildConfig = true
+    }
 //    buildTypes {
 //        getByName("all") {
 //            buildConfigField(
@@ -54,11 +58,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-Xjvm-default=compatibility"
     }
diff --git a/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastScreen.kt b/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastScreen.kt
@@ -64,14 +64,14 @@ import androidx.navigation.NavHostController
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
 import com.google.android.exoplayer2.ui.PlayerView
+import com.worker8.androiddevnews.common.compose.HtmlView
 import com.worker8.androiddevnews.common.compose.theme.Neutral01
 import com.worker8.androiddevnews.common.compose.theme.Neutral02
 import com.worker8.androiddevnews.common.compose.theme.Neutral09
 import com.worker8.androiddevnews.common.compose.theme.Neutral10
 import com.worker8.androiddevnews.common.compose.theme.Primary07
 import com.worker8.androiddevnews.common.util.DurationParser
 import com.worker8.androiddevnews.common.util.toRelativeTimeString
-import com.worker8.androiddevnews.ui.HtmlView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.time.ExperimentalTime
diff --git a/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastService.kt b/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastService.kt
@@ -196,23 +196,32 @@ class PodcastService : Service() {
                 )
                 initAction?.onClick(exoPlayer, this@PodcastService)
             }
+
             PodcastServiceAction.Forward.name -> {
                 forwardAction.onClick(exoPlayer, this@PodcastService)
             }
+
             PodcastServiceAction.Rewind.name -> {
                 rewindAction.onClick(exoPlayer, this@PodcastService)
             }
+
             PodcastServiceAction.PlayPause.name -> {
                 playPauseAction.onClick(exoPlayer, this@PodcastService)
             }
+
             PodcastServiceAction.Close.name -> {
                 closeAction.onClick(exoPlayer, this@PodcastService)
             }
         }
         val pendingIntent =
             //TODO - deeplink into podcast
             Intent(applicationContext, MainActivity::class.java).let { notificationIntent ->
-                PendingIntent.getActivity(applicationContext, 0, notificationIntent, PendingIntent.FLAG_MUTABLE)
+                PendingIntent.getActivity(
+                    applicationContext,
+                    0,
+                    notificationIntent,
+                    PendingIntent.FLAG_MUTABLE
+                )
             }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -248,7 +257,7 @@ class PodcastService : Service() {
                 .addAction(closeAction.buildNotificationAction(this, exoPlayer.isPlaying))
                 .setContentTitle(initAction?.title)
                 .setContentText(initAction?.description)
-                .setSmallIcon(R.drawable.exo_icon_circular_play)
+                .setSmallIcon(com.google.android.exoplayer2.ui.R.drawable.exo_icon_circular_play)
                 .setContentIntent(pendingIntent)
                 .setTicker(initAction?.title)
                 .setOnlyAlertOnce(true)
diff --git a/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastServiceAction.kt b/app/src/main/java/com/worker8/androiddevnews/podcast/PodcastServiceAction.kt
@@ -53,7 +53,7 @@ sealed interface PodcastServiceAction {
             isPlaying: Boolean
         ): NotificationCompat.Action {
             return NotificationCompat.Action.Builder(
-                R.drawable.exo_icon_fastforward,
+                com.google.android.exoplayer2.R.drawable.exo_icon_fastforward,
                 name,
                 context.makeServiceIntent(name)
             ).build()
@@ -74,7 +74,7 @@ sealed interface PodcastServiceAction {
             isPlaying: Boolean
         ): NotificationCompat.Action? {
             return NotificationCompat.Action.Builder(
-                R.drawable.exo_icon_rewind,
+                com.google.android.exoplayer2.R.drawable.exo_icon_rewind,
                 name,
                 context.makeServiceIntent(name)
             ).build()
@@ -96,9 +96,9 @@ sealed interface PodcastServiceAction {
         ): NotificationCompat.Action? {
             return NotificationCompat.Action.Builder(
                 if (isPlaying) {
-                    R.drawable.exo_icon_pause
+                    com.google.android.exoplayer2.R.drawable.exo_icon_pause
                 } else {
-                    R.drawable.exo_icon_play
+                    com.google.android.exoplayer2.R.drawable.exo_icon_play
                 },
                 name,
                 context.makeServiceIntent(name)
@@ -128,7 +128,7 @@ sealed interface PodcastServiceAction {
             isPlaying: Boolean
         ): NotificationCompat.Action? {
             return NotificationCompat.Action.Builder(
-                R.drawable.exo_icon_stop,
+                com.google.android.exoplayer2.R.drawable.exo_icon_stop,
                 name,
                 context.makeServiceIntent(name)
             ).build()
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 group = "com.worker8.androiddevnews.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
diff --git a/build-logic/convention/src/main/kotlin/com/worker8/androiddevnews/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/worker8/androiddevnews/AndroidCompose.kt
@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByType
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
diff --git a/build-logic/convention/src/main/kotlin/com/worker8/androiddevnews/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/worker8/androiddevnews/KotlinAndroid.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 33
@@ -40,8 +40,8 @@ internal fun Project.configureKotlinAndroid(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
             isCoreLibraryDesugaringEnabled = true
         }
 
@@ -59,8 +59,8 @@ internal fun Project.configureKotlinAndroid(
                 "-opt-in=kotlin.Experimental",
             )
 
-            // Set JVM target to 1.8
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            // Set JVM target to 17
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }
 
@@ -71,6 +71,6 @@ internal fun Project.configureKotlinAndroid(
     }
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -30,4 +30,3 @@ dependencyResolutionManagement {
 
 rootProject.name = "build-logic"
 include(":convention")
-enableFeaturePreview("VERSION_CATALOGS")
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -26,11 +26,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
diff --git a/common/src/main/java/com/worker8/androiddevnews/common/compose/HtmlView.kt b/common/src/main/java/com/worker8/androiddevnews/common/compose/HtmlView.kt
@@ -1,4 +1,4 @@
-package com.worker8.androiddevnews.ui
+package com.worker8.androiddevnews.common.compose
 
 import android.text.SpannableStringBuilder
 import android.text.Spanned
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ junit = "4.13.2"
 junitExt = "1.1.3"
 espresso = "3.4.0"
 kotlinGradlePlugin = "1.7.10"
-androidGradlePlugin = "7.3.0"
+androidGradlePlugin = "8.1.2"
 
 [libraries]
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jul 16 01:03:05 JST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/reddit/build.gradle.kts b/reddit/build.gradle.kts
@@ -28,11 +28,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
diff --git a/reddit/src/main/java/com/worker8/androiddevnews/reddit/detail/RedditDetailScreen.kt b/reddit/src/main/java/com/worker8/androiddevnews/reddit/detail/RedditDetailScreen.kt
@@ -36,11 +36,11 @@ import com.kirkbushman.araw.models.MoreComments
 import com.kirkbushman.araw.models.Submission
 import com.kirkbushman.araw.models.base.CommentData
 import com.kirkbushman.araw.utils.createdDate
+import com.worker8.androiddevnews.common.compose.HtmlView
 import com.worker8.androiddevnews.common.compose.theme.Neutral02
 import com.worker8.androiddevnews.common.compose.theme.Primary01
 import com.worker8.androiddevnews.common.util.toRelativeTimeString
 import com.worker8.androiddevnews.reddit.shared.RedditContentCard
-import com.worker8.androiddevnews.ui.HtmlView
 import kotlinx.coroutines.cancel
 
 private const val ColorBarWidth = 3
diff --git a/reddit/src/main/java/com/worker8/androiddevnews/reddit/shared/RedditContentCard.kt b/reddit/src/main/java/com/worker8/androiddevnews/reddit/shared/RedditContentCard.kt
@@ -30,6 +30,7 @@ import androidx.core.text.HtmlCompat
 import coil.compose.AsyncImage
 import com.kirkbushman.araw.models.Submission
 import com.kirkbushman.araw.utils.createdDate
+import com.worker8.androiddevnews.common.compose.HtmlView
 import com.worker8.androiddevnews.common.compose.theme.Neutral01
 import com.worker8.androiddevnews.common.compose.theme.Neutral06
 import com.worker8.androiddevnews.common.compose.theme.Neutral10
@@ -39,7 +40,6 @@ import com.worker8.androiddevnews.reddit.R
 import com.worker8.androiddevnews.reddit.RenderFlair
 import com.worker8.androiddevnews.reddit.isImageUrl
 import com.worker8.androiddevnews.reddit.upvoteRatioPercentage
-import com.worker8.androiddevnews.ui.HtmlView
 
 @Composable
 fun RedditContentCard(

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,12 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`android {`
	`11`	`+ namespace = "com.worker8.androiddevnews"`
`11`	`12`	`compileSdk = 33`
`12`	`13`	`buildToolsVersion = "30.0.3"`
	`14`	`+ buildFeatures {`
	`15`	`+ buildConfig = true`
	`16`	`+ }`
`13`	`17`	`// buildTypes {`
`14`	`18`	`// getByName("all") {`
`15`	`19`	`// buildConfigField(`
`@@ -54,11 +58,11 @@ android {`
`54`	`58`	`}`
`55`	`59`	`}`
`56`	`60`	`compileOptions {`
`57`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`58`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`61`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`62`	`+ targetCompatibility = JavaVersion.VERSION_17`
`59`	`63`	`}`
`60`	`64`	`kotlinOptions {`
`61`		`- jvmTarget = "1.8"`
	`65`	`+ jvmTarget = "17"`
`62`	`66`	`freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"`
`63`	`67`	`freeCompilerArgs += "-Xjvm-default=compatibility"`
`64`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,23 +196,32 @@ class PodcastService : Service() {`
`196`	`196`	`)`
`197`	`197`	`initAction?.onClick(exoPlayer, this@PodcastService)`
`198`	`198`	`}`
	`199`	`+`
`199`	`200`	`PodcastServiceAction.Forward.name -> {`
`200`	`201`	`forwardAction.onClick(exoPlayer, this@PodcastService)`
`201`	`202`	`}`
	`203`	`+`
`202`	`204`	`PodcastServiceAction.Rewind.name -> {`
`203`	`205`	`rewindAction.onClick(exoPlayer, this@PodcastService)`
`204`	`206`	`}`
	`207`	`+`
`205`	`208`	`PodcastServiceAction.PlayPause.name -> {`
`206`	`209`	`playPauseAction.onClick(exoPlayer, this@PodcastService)`
`207`	`210`	`}`
	`211`	`+`
`208`	`212`	`PodcastServiceAction.Close.name -> {`
`209`	`213`	`closeAction.onClick(exoPlayer, this@PodcastService)`
`210`	`214`	`}`
`211`	`215`	`}`
`212`	`216`	`val pendingIntent =`
`213`	`217`	`//TODO - deeplink into podcast`
`214`	`218`	`Intent(applicationContext, MainActivity::class.java).let { notificationIntent ->`
`215`		`- PendingIntent.getActivity(applicationContext, 0, notificationIntent, PendingIntent.FLAG_MUTABLE)`
	`219`	`+ PendingIntent.getActivity(`
	`220`	`+ applicationContext,`
	`221`	`+ 0,`
	`222`	`+ notificationIntent,`
	`223`	`+ PendingIntent.FLAG_MUTABLE`
	`224`	`+ )`
`216`	`225`	`}`
`217`	`226`
`218`	`227`	`if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {`
`@@ -248,7 +257,7 @@ class PodcastService : Service() {`
`248`	`257`	`.addAction(closeAction.buildNotificationAction(this, exoPlayer.isPlaying))`
`249`	`258`	`.setContentTitle(initAction?.title)`
`250`	`259`	`.setContentText(initAction?.description)`
`251`		`- .setSmallIcon(R.drawable.exo_icon_circular_play)`
	`260`	`+ .setSmallIcon(com.google.android.exoplayer2.ui.R.drawable.exo_icon_circular_play)`
`252`	`261`	`.setContentIntent(pendingIntent)`
`253`	`262`	`.setTicker(initAction?.title)`
`254`	`263`	`.setOnlyAlertOnce(true)`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ plugins {`
`5`	`5`	`group = "com.worker8.androiddevnews.buildlogic"`
`6`	`6`
`7`	`7`	`java {`
`8`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`9`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`8`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`9`	`+ targetCompatibility = JavaVersion.VERSION_17`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions`
`30`	`30`	`* Configure base Kotlin with Android options`
`31`	`31`	`*/`
`32`	`32`	`internal fun Project.configureKotlinAndroid(`
`33`		`- commonExtension: CommonExtension<, , , >,`
	`33`	`+ commonExtension: CommonExtension<, , , , *>,`
`34`	`34`	`) {`
`35`	`35`	`commonExtension.apply {`
`36`	`36`	`compileSdk = 33`
`@@ -40,8 +40,8 @@ internal fun Project.configureKotlinAndroid(`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`compileOptions {`
`43`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`44`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`43`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`44`	`+ targetCompatibility = JavaVersion.VERSION_17`
`45`	`45`	`isCoreLibraryDesugaringEnabled = true`
`46`	`46`	`}`
`47`	`47`
`@@ -59,8 +59,8 @@ internal fun Project.configureKotlinAndroid(`
`59`	`59`	`"-opt-in=kotlin.Experimental",`
`60`	`60`	`)`
`61`	`61`
`62`		`- // Set JVM target to 1.8`
`63`		`- jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`62`	`+ // Set JVM target to 17`
	`63`	`+ jvmTarget = JavaVersion.VERSION_17.toString()`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`@@ -71,6 +71,6 @@ internal fun Project.configureKotlinAndroid(`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-fun CommonExtension<, , , >.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {`
	`74`	`+fun CommonExtension<, , , , *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {`
`75`	`75`	`(this as ExtensionAware).extensions.configure("kotlinOptions", block)`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,3 @@ dependencyResolutionManagement {`
`30`	`30`
`31`	`31`	`rootProject.name = "build-logic"`
`32`	`32`	`include(":convention")`
`33`		`-enableFeaturePreview("VERSION_CATALOGS")`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ android {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`compileOptions {`
`29`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`30`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`29`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`30`	`+ targetCompatibility = JavaVersion.VERSION_17`
`31`	`31`	`}`
`32`	`32`	`kotlinOptions {`
`33`		`- jvmTarget = "1.8"`
	`33`	`+ jvmTarget = "17"`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.worker8.androiddevnews.ui`
	`1`	`+package com.worker8.androiddevnews.common.compose`
`2`	`2`
`3`	`3`	`import android.text.SpannableStringBuilder`
`4`	`4`	`import android.text.Spanned`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ android {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`32`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`31`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_17`
`33`	`33`	`}`
`34`	`34`	`kotlinOptions {`
`35`		`- jvmTarget = "1.8"`
	`35`	`+ jvmTarget = "17"`
`36`	`36`	`}`
`37`	`37`	`buildFeatures {`
`38`	`38`	`compose = true`