build: kotlin 1.7.20, migrate to namespace instead of manifest package

hoc081098 · hoc081098 · commit f08c3982ce25 · 2022-11-08T22:35:29.000+07:00
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
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="com.hoc.flowmvi">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
@@ -7,7 +7,7 @@ import org.gradle.plugin.use.PluginDependenciesSpec
 import org.gradle.plugin.use.PluginDependencySpec
 
 const val ktlintVersion = "0.46.1"
-const val kotlinVersion = "1.7.10"
+const val kotlinVersion = "1.7.20"
 
 object appConfig {
   const val applicationId = "com.hoc.flowmvi"
@@ -71,11 +71,11 @@ object deps {
 
   const val coil = "io.coil-kt:coil:2.1.0"
   const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.4.0"
-  const val flowExt = "io.github.hoc081098:FlowExt:0.5.0-SNAPSHOT"
+  const val flowExt = "io.github.hoc081098:FlowExt:0.5.0"
   const val timber = "com.jakewharton.timber:timber:5.0.1"
 
   object arrow {
-    private const val version = "1.1.2"
+    private const val version = "1.1.3"
     const val core = "io.arrow-kt:arrow-core:$version"
   }
 
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.core_ui"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.core_ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.data"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.data">
-
-</manifest>
+<manifest />
diff --git a/feature-add/build.gradle.kts b/feature-add/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.add"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-add/src/main/AndroidManifest.xml b/feature-add/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.add">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/feature-main/build.gradle.kts b/feature-main/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.main"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-main/src/main/AndroidManifest.xml b/feature-main/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.main">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.search"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-search/src/main/AndroidManifest.xml b/feature-search/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.search">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/mvi/mvi-base/build.gradle.kts b/mvi/mvi-base/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.mvi_base"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/mvi/mvi-base/src/main/AndroidManifest.xml b/mvi/mvi-base/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.mvi_base">
-
-</manifest>
+<manifest />
diff --git a/mvi/mvi-testing/build.gradle.kts b/mvi/mvi-testing/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.mvi_testing"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/mvi/mvi-testing/src/main/AndroidManifest.xml b/mvi/mvi-testing/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.mvi_testing">
-
-</manifest>
+<manifest />
diff --git a/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt b/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt
@@ -63,10 +63,12 @@ infix fun <T, B> MockKStubScope<T, B>.returnsManyWithDelay(values: List<T>) {
 
 @ExperimentalTime
 @ExperimentalCoroutinesApi
-abstract class BaseMviViewModelTest<I : MviIntent,
+abstract class BaseMviViewModelTest<
+  I : MviIntent,
   S : MviViewState,
   E : MviSingleEvent,
-  VM : MviViewModel<I, S, E>,> {
+  VM : MviViewModel<I, S, E>,
+  > {
   @get:Rule
   val coroutineRule = TestCoroutineDispatcherRule(
     testDispatcher = UnconfinedTestDispatcher(

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace = "com.hoc.flowmvi"`
`8`	`9`	`compileSdk = appConfig.compileSdkVersion`
`9`	`10`	`buildToolsVersion = appConfig.buildToolsVersion`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace = "com.hoc.flowmvi.core_ui"`
`7`	`8`	`compileSdk = appConfig.compileSdkVersion`
`8`	`9`	`buildToolsVersion = appConfig.buildToolsVersion`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace = "com.hoc.flowmvi.data"`
`8`	`9`	`compileSdk = appConfig.compileSdkVersion`
`9`	`10`	`buildToolsVersion = appConfig.buildToolsVersion`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace = "com.hoc.flowmvi.ui.add"`
`8`	`9`	`compileSdk = appConfig.compileSdkVersion`
`9`	`10`	`buildToolsVersion = appConfig.buildToolsVersion`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace = "com.hoc.flowmvi.ui.main"`
`7`	`8`	`compileSdk = appConfig.compileSdkVersion`
`8`	`9`	`buildToolsVersion = appConfig.buildToolsVersion`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace = "com.hoc.flowmvi.ui.search"`
`8`	`9`	`compileSdk = appConfig.compileSdkVersion`
`9`	`10`	`buildToolsVersion = appConfig.buildToolsVersion`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace = "com.hoc.flowmvi.mvi_base"`
`7`	`8`	`compileSdk = appConfig.compileSdkVersion`
`8`	`9`	`buildToolsVersion = appConfig.buildToolsVersion`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace = "com.hoc.flowmvi.mvi_testing"`
`7`	`8`	`compileSdk = appConfig.compileSdkVersion`
`8`	`9`	`buildToolsVersion = appConfig.buildToolsVersion`
`9`	`10`