Merge pull request #4 from xtoolkit/chore-updates

chore: update all dependencies
xtoolkit · Jan 21, 2023 · 8632991 · 8632991
2 parents c9707af + 3762c99
commit 8632991
Show file tree

Hide file tree

Showing 24 changed files with 74 additions and 46 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,8 +5,9 @@ plugins {
 
 android {
     defaultConfig {
-        targetSdk = 32
+        targetSdk = 33
         applicationId = "io.github.xtoolkit.mir"
+        testApplicationId = "io.github.xtoolkit.mir.test"
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.xtoolkit.mir">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".framework.MainApplication"
@@ -23,4 +22,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 group = "io.github.xtoolkit.mir.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {

diff --git a/build-logic/convention/src/main/kotlin/io/github/xtoolkit/mir/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/io/github/xtoolkit/mir/AndroidCompose.kt
@@ -4,7 +4,6 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
-import java.io.File
 
 /**
  * Configure Compose-specific options
@@ -20,7 +19,8 @@ internal fun Project.configureAndroidCompose(
         }
 
         composeOptions {
-            kotlinCompilerExtensionVersion = libs.findVersion("androidxCompose").get().toString()
+            kotlinCompilerExtensionVersion =
+                libs.findVersion("androidxComposeCompiler").get().toString()
         }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/io/github/xtoolkit/mir/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/io/github/xtoolkit/mir/KotlinAndroid.kt
@@ -16,7 +16,7 @@ internal fun Project.configureKotlinAndroid(baseAppModuleExtension: BaseAppModul
     configureKotlinAndroid(baseAppModuleExtension as CommonExtension<*, *, *, *>)
     baseAppModuleExtension.apply {
         defaultConfig {
-            targetSdk = 32
+            targetSdk = 33
             lint.checkReleaseBuilds = false
 
             vectorDrawables {
@@ -40,32 +40,27 @@ internal fun Project.configureKotlinAndroid(baseAppModuleExtension: BaseAppModul
 
 internal fun Project.configureKotlinAndroid(libraryExtension: LibraryExtension) {
     configureKotlinAndroid(libraryExtension as CommonExtension<*, *, *, *>)
-    libraryExtension.apply {
-        defaultConfig {
-            targetSdk = 32
-        }
-    }
+    libraryExtension.defaultConfig.targetSdk = 33
 }
 
 internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*, *, *, *>) {
     commonExtension.apply {
-        compileSdk = 32
+        compileSdk = 33
 
         defaultConfig {
             minSdk = 21
         }
 
         buildTypes {
             getByName("debug") {
-                isTestCoverageEnabled = true
+                enableAndroidTestCoverage = true
                 enableUnitTestCoverage = true
             }
         }
 
         compileOptions {
             sourceCompatibility = JavaVersion.VERSION_1_8
             targetCompatibility = JavaVersion.VERSION_1_8
-            // isCoreLibraryDesugaringEnabled = true
         }
 
         kotlinOptions {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,34 +1,35 @@
 [versions]
 
 # AndroidX
-androidxCore = "1.8.0"
-androidxFragment = "1.5.1"
+androidxCore = "1.9.0"
+androidxFragment = "1.5.5"
 androidxCollection = "1.2.0"
 androidxLifecycle = "2.5.1"
-androidxCompose = "1.2.0"
-androidxComposeMaterial3 = "1.0.0-alpha15"
-androidxComposeActivity = "1.5.1"
+androidxCompose = "1.3.3"
+androidxComposeCompiler = "1.4.0"
+androidxComposeMaterial3 = "1.0.1"
+androidxComposeActivity = "1.6.1"
 
 # Android
-androidMaterial = "1.6.1"
-androidThemeAdaptor = "1.0.15"
-androidAccompanist = "0.23.1"
+androidMaterial = "1.7.0"
+androidThemeAdaptor = "1.1.1"
+androidAccompanist = "0.28.0"
 
 # Plugins
-androidGradle = "7.2.1"
-kotlin = "1.7.0"
-rootCoverage = "1.5.3"
+androidGradle = "7.4.0"
+kotlin = "1.8.0"
+rootCoverage = "1.6.0"
 
 # Other
-room = "2.4.3"
-koinAndroid = "3.3.0"
-koinCore = "3.2.2"
+room = "2.5.0"
+koinCore = "3.3.2"
+koinCompose = "3.3.0"
 
 # test
 kotlinTest = "1.6.4"
 junit = "4.13.2"
-mockk = "1.13.2"
-androidxTestCore = "1.4.0"
+mockk = "1.13.3"
+androidxTestCore = "1.5.0"
 jacoco = "0.8.7"
 
 [libraries]
@@ -42,14 +43,14 @@ androidx-compose-preview = { group = "androidx.compose.ui", name = "ui-tooling-p
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
 androidx-compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxComposeActivity" }
 android-material = { group = "com.google.android.material", name = "material", version.ref = "androidMaterial" }
-android-themeadapter = { group = "com.google.android.material", name = "compose-theme-adapter-3", version.ref = "androidThemeAdaptor" }
+android-themeadapter = { group = "com.google.accompanist", name = "accompanist-themeadapter-material3", version.ref = "androidAccompanist" }
 android-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "androidAccompanist" }
 android-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "androidAccompanist" }
 room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
-koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koinAndroid" }
-koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koinAndroid" }
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koinCore" }
+koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koinCompose" }
 test-kotlin = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinTest" }
 test-junit = { group = "junit", name = "junit", version.ref = "junit" }
 test-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 04 14:18:53 IRDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/level/build.gradle.kts b/level/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.level"
+}
+
 dependencies {
     implementation(project(":util"))
     implementation(project(":util:core"))

diff --git a/level/core/build.gradle.kts b/level/core/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library.core")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.level.core"
+}
+
 dependencies {
     implementation(project(":util:core"))
     implementation(project(":playground:core"))

diff --git a/level/core/src/main/AndroidManifest.xml b/level/core/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.level.core" />
+<manifest />
diff --git a/level/src/main/AndroidManifest.xml b/level/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.level" />
+<manifest />
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.playground"
+}
+
 dependencies {
     implementation(project(":util"))
     implementation(project(":util:core"))

diff --git a/playground/core/build.gradle.kts b/playground/core/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library.core")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.playground.core"
+}
+
 dependencies {
     implementation(project(":util:core"))
 }
diff --git a/playground/core/src/main/AndroidManifest.xml b/playground/core/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.playground.core" />
+<manifest />
diff --git a/playground/src/main/AndroidManifest.xml b/playground/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.playground" />
+<manifest />
diff --git a/user/build.gradle.kts b/user/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.user"
+}
+
 dependencies {
     implementation(project(":util"))
     implementation(project(":util:core"))

diff --git a/user/core/build.gradle.kts b/user/core/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library.core")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.user.core"
+}
+
 dependencies {
     implementation(project(":util:core"))
     implementation(project(":playground:core"))

diff --git a/user/core/src/main/AndroidManifest.xml b/user/core/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.user.core" />
+<manifest />
diff --git a/user/src/main/AndroidManifest.xml b/user/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.user" />
+<manifest />
diff --git a/util/build.gradle.kts b/util/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     id("mir.android.library")
 }
 
+android {
+    namespace = "io.github.xtoolkit.mir.util"
+}
+
 dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.material3)

diff --git a/util/core/build.gradle.kts b/util/core/build.gradle.kts
@@ -1,3 +1,7 @@
 plugins {
     id("mir.android.library.core")
 }
+
+android {
+    namespace = "io.github.xtoolkit.mir.util.core"
+}
diff --git a/util/core/src/main/AndroidManifest.xml b/util/core/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.util.core" />
+<manifest />
diff --git a/util/src/main/AndroidManifest.xml b/util/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.github.xtoolkit.mir.util" />
+<manifest />
diff --git a/util/src/main/java/io/github/xtoolkit/mir/util/presentation/theme/DefaultTheme.kt b/util/src/main/java/io/github/xtoolkit/mir/util/presentation/theme/DefaultTheme.kt
@@ -5,7 +5,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
-import com.google.android.material.composethemeadapter3.createMdc3Theme
+import com.google.accompanist.themeadapter.material3.createMdc3Theme
 
 private val LightThemeColors = lightColorScheme()