Merge pull request #83 from skydoves/agp/8.1.0

skydoves · web-flow · commit e77129d656ed · 2023-07-30T22:11:44.000+09:00
Migrate to AGP 8.1.0, Gradle 8.2.1, Kotlin 1.9.0, and KSP
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -10,12 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: zulu
+          java-version: 17
 
       - name: Cache Gradle and wrapper
         uses: actions/cache@v2
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,6 +26,8 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex"
+
   defaultConfig {
     applicationId = "com.skydoves.pokedex"
     minSdk = Configuration.minSdk
@@ -37,12 +39,13 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   buildFeatures {
     dataBinding = true
+    buildConfig = true
   }
 
   hilt {
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/ui/details/DetailViewModel.kt b/app/src/main/kotlin/com/skydoves/pokedex/ui/details/DetailViewModel.kt
@@ -23,8 +23,8 @@ import androidx.lifecycle.viewModelScope
 import com.skydoves.bindables.BindingViewModel
 import com.skydoves.bindables.asBindingProperty
 import com.skydoves.bindables.bindingProperty
-import com.skydoves.core.data.repository.DetailRepository
 import com.skydoves.pokedex.core.model.PokemonInfo
+import com.skydoves.pokedex.core.repository.DetailRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/ui/main/MainViewModel.kt b/app/src/main/kotlin/com/skydoves/pokedex/ui/main/MainViewModel.kt
@@ -22,8 +22,8 @@ import androidx.lifecycle.viewModelScope
 import com.skydoves.bindables.BindingViewModel
 import com.skydoves.bindables.asBindingProperty
 import com.skydoves.bindables.bindingProperty
-import com.skydoves.core.data.repository.MainRepository
 import com.skydoves.pokedex.core.model.Pokemon
+import com.skydoves.pokedex.core.repository.MainRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flatMapLatest
diff --git a/app/src/test/kotlin/com/skydoves/pokedex/DetailViewModelTest.kt b/app/src/test/kotlin/com/skydoves/pokedex/DetailViewModelTest.kt
@@ -21,12 +21,12 @@ import com.nhaarman.mockitokotlin2.atLeastOnce
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import com.skydoves.core.data.repository.DetailRepository
-import com.skydoves.core.data.repository.DetailRepositoryImpl
 import com.skydoves.pokedex.core.database.PokemonInfoDao
 import com.skydoves.pokedex.core.database.entitiy.mapper.asEntity
 import com.skydoves.pokedex.core.network.service.PokedexClient
 import com.skydoves.pokedex.core.network.service.PokedexService
+import com.skydoves.pokedex.core.repository.DetailRepository
+import com.skydoves.pokedex.core.repository.DetailRepositoryImpl
 import com.skydoves.pokedex.core.test.MainCoroutinesRule
 import com.skydoves.pokedex.core.test.MockUtil
 import com.skydoves.pokedex.ui.details.DetailViewModel
diff --git a/app/src/test/kotlin/com/skydoves/pokedex/MainViewModelTest.kt b/app/src/test/kotlin/com/skydoves/pokedex/MainViewModelTest.kt
@@ -21,12 +21,12 @@ import com.nhaarman.mockitokotlin2.atLeastOnce
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import com.skydoves.core.data.repository.MainRepository
-import com.skydoves.core.data.repository.MainRepositoryImpl
 import com.skydoves.pokedex.core.database.PokemonDao
 import com.skydoves.pokedex.core.database.entitiy.mapper.asEntity
 import com.skydoves.pokedex.core.network.service.PokedexClient
 import com.skydoves.pokedex.core.network.service.PokedexService
+import com.skydoves.pokedex.core.repository.MainRepository
+import com.skydoves.pokedex.core.repository.MainRepositoryImpl
 import com.skydoves.pokedex.core.test.MainCoroutinesRule
 import com.skydoves.pokedex.core.test.MockUtil
 import com.skydoves.pokedex.ui.main.MainViewModel
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -23,10 +23,11 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.benchmark"
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   kotlinOptions {
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
@@ -14,10 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.skydoves.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <queries>
-        <package android:name="com.skydoves.pokedex" />
-    </queries>
+  <queries>
+    <package android:name="com.skydoves.pokedex" />
+  </queries>
 </manifest>
diff --git a/benchmark/src/main/kotlin/com/github/skydoves/benchmark/BaselineProfileGenerator.kt b/benchmark/src/main/kotlin/com/github/skydoves/benchmark/BaselineProfileGenerator.kt
@@ -16,7 +16,8 @@
 
 package com.github.skydoves.benchmark
 
-import androidx.benchmark.macro.ExperimentalStableBaselineProfilesApi
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.BySelector
@@ -30,14 +31,14 @@ import org.junit.Test
 /**
  * Generates a baseline profile which can be copied to `app/src/main/baseline-prof.txt`.
  */
+@RequiresApi(Build.VERSION_CODES.P)
 class BaselineProfileGenerator {
   @get:Rule
   val baselineProfileRule = BaselineProfileRule()
 
   @Test
-  @OptIn(ExperimentalStableBaselineProfilesApi::class)
   fun startup() =
-    baselineProfileRule.collectStableBaselineProfile(
+    baselineProfileRule.collect(
       packageName = packageName,
       stableIterations = 2,
       maxIterations = 8
@@ -50,7 +51,7 @@ class BaselineProfileGenerator {
       device.waitForIdle()
 
       // Navigate to the details screen
-      device.testDiscover() || return@collectStableBaselineProfile
+      device.testDiscover() || return@collect
       device.navigateFromMainToDetails()
       device.pressBack()
     }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,7 +37,7 @@ subprojects {
   apply(plugin = rootProject.libs.plugins.spotless.get().pluginId)
 
   tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
     kotlinOptions.freeCompilerArgs += listOf(
       "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
       "-Xopt-in=kotlin.time.ExperimentalTime",
diff --git a/buildSrc/src/main/kotlin/com/skydoves/pokedex/Configuration.kt b/buildSrc/src/main/kotlin/com/skydoves/pokedex/Configuration.kt
@@ -1,8 +1,8 @@
 package com.skydoves.pokedex
 
 object Configuration {
-  const val compileSdk = 33
-  const val targetSdk = 33
+  const val compileSdk = 34
+  const val targetSdk = 34
   const val minSdk = 23
   const val majorVersion = 1
   const val minorVersion = 1
diff --git a/core-data/build.gradle.kts b/core-data/build.gradle.kts
@@ -24,10 +24,15 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.core.data"
 
   defaultConfig {
     minSdk = Configuration.minSdk
-    targetSdk = Configuration.targetSdk
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
diff --git a/core-data/src/main/AndroidManifest.xml b/core-data/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<manifest package="com.skydoves.core.data" />
+<manifest package="com.skydoves.pokedex.core.data" />
diff --git a/core-data/src/main/kotlin/com/skydoves/pokedex/core/di/DataModule.kt b/core-data/src/main/kotlin/com/skydoves/pokedex/core/di/DataModule.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.skydoves.core.data.di
+package com.skydoves.pokedex.core.di
 
-import com.skydoves.core.data.repository.DetailRepository
-import com.skydoves.core.data.repository.DetailRepositoryImpl
-import com.skydoves.core.data.repository.MainRepository
-import com.skydoves.core.data.repository.MainRepositoryImpl
+import com.skydoves.pokedex.core.repository.DetailRepository
+import com.skydoves.pokedex.core.repository.DetailRepositoryImpl
+import com.skydoves.pokedex.core.repository.MainRepository
+import com.skydoves.pokedex.core.repository.MainRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/DetailRepository.kt b/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/DetailRepository.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.skydoves.core.data.repository
+package com.skydoves.pokedex.core.repository
 
 import androidx.annotation.WorkerThread
 import com.skydoves.pokedex.core.model.PokemonInfo
diff --git a/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/DetailRepositoryImpl.kt b/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/DetailRepositoryImpl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.skydoves.core.data.repository
+package com.skydoves.pokedex.core.repository
 
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
diff --git a/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/MainRepository.kt b/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/MainRepository.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.skydoves.core.data.repository
+package com.skydoves.pokedex.core.repository
 
 import androidx.annotation.WorkerThread
 import com.skydoves.pokedex.core.model.Pokemon
diff --git a/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/MainRepositoryImpl.kt b/core-data/src/main/kotlin/com/skydoves/pokedex/core/repository/MainRepositoryImpl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.skydoves.core.data.repository
+package com.skydoves.pokedex.core.repository
 
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
diff --git a/core-data/src/test/kotlin/com/skydoves/pokedex/core/data/DetailRepositoryTest.kt b/core-data/src/test/kotlin/com/skydoves/pokedex/core/data/DetailRepositoryTest.kt
@@ -22,11 +22,11 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.whenever
-import com.skydoves.core.data.repository.DetailRepositoryImpl
 import com.skydoves.pokedex.core.database.PokemonInfoDao
 import com.skydoves.pokedex.core.database.entitiy.mapper.asEntity
 import com.skydoves.pokedex.core.network.service.PokedexClient
 import com.skydoves.pokedex.core.network.service.PokedexService
+import com.skydoves.pokedex.core.repository.DetailRepositoryImpl
 import com.skydoves.pokedex.core.test.MainCoroutinesRule
 import com.skydoves.pokedex.core.test.MockUtil.mockPokemonInfo
 import com.skydoves.sandwich.ApiResponse
diff --git a/core-data/src/test/kotlin/com/skydoves/pokedex/core/data/MainRepositoryImplTest.kt b/core-data/src/test/kotlin/com/skydoves/pokedex/core/data/MainRepositoryImplTest.kt
@@ -22,12 +22,12 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.whenever
-import com.skydoves.core.data.repository.MainRepositoryImpl
 import com.skydoves.pokedex.core.database.PokemonDao
 import com.skydoves.pokedex.core.database.entitiy.mapper.asEntity
 import com.skydoves.pokedex.core.network.model.PokemonResponse
 import com.skydoves.pokedex.core.network.service.PokedexClient
 import com.skydoves.pokedex.core.network.service.PokedexService
+import com.skydoves.pokedex.core.repository.MainRepositoryImpl
 import com.skydoves.pokedex.core.test.MainCoroutinesRule
 import com.skydoves.pokedex.core.test.MockUtil.mockPokemonList
 import com.skydoves.sandwich.ApiResponse
diff --git a/core-database/build.gradle.kts b/core-database/build.gradle.kts
@@ -25,10 +25,10 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.core.database"
 
   defaultConfig {
     minSdk = Configuration.minSdk
-    targetSdk = Configuration.targetSdk
     // The schemas directory contains a schema file for each version of the Room database.
     // This is required to enable Room auto migrations.
     // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
@@ -40,6 +40,11 @@ android {
   sourceSets.getByName("test") {
     assets.srcDir(files("$projectDir/schemas"))
   }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+  }
 }
 
 dependencies {
diff --git a/core-database/src/main/kotlin/com/skydoves/pokedex/core/database/entitiy/mapper/PokemonEntityMapper.kt b/core-database/src/main/kotlin/com/skydoves/pokedex/core/database/entitiy/mapper/PokemonEntityMapper.kt
@@ -46,6 +46,6 @@ fun List<Pokemon>.asEntity(): List<PokemonEntity> {
   return PokemonEntityMapper.asEntity(this)
 }
 
-fun List<PokemonEntity>.asDomain(): List<Pokemon> {
-  return PokemonEntityMapper.asDomain(this)
+fun List<PokemonEntity>?.asDomain(): List<Pokemon> {
+  return PokemonEntityMapper.asDomain(this.orEmpty())
 }
diff --git a/core-model/build.gradle.kts b/core-model/build.gradle.kts
@@ -25,10 +25,15 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.core.model"
 
   defaultConfig {
     minSdk = Configuration.minSdk
-    targetSdk = Configuration.targetSdk
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
diff --git a/core-network/build.gradle.kts b/core-network/build.gradle.kts
@@ -25,10 +25,15 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.core.network"
 
   defaultConfig {
     minSdk = Configuration.minSdk
-    targetSdk = Configuration.targetSdk
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
diff --git a/core-test/build.gradle.kts b/core-test/build.gradle.kts
@@ -23,10 +23,15 @@ plugins {
 
 android {
   compileSdk = Configuration.compileSdk
+  namespace = "com.skydoves.pokedex.core.test"
 
   defaultConfig {
     minSdk = Configuration.minSdk
-    targetSdk = Configuration.targetSdk
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
