Use androidx Bundle, clean up imports

zsmb13 · May 10, 2024 · 57505e9 · 57505e9
1 parent 168bcd4
commit 57505e9
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 34 deletions.
diff --git a/app/src/androidMain/kotlin/co/zsmb/requirektx/MainActivity.kt b/app/src/androidMain/kotlin/co/zsmb/requirektx/MainActivity.kt
@@ -1,7 +1,7 @@
 package co.zsmb.requirektx
 
 import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/requirektx-bundle/build.gradle.kts b/requirektx-bundle/build.gradle.kts
@@ -6,7 +6,9 @@ android.namespace = "co.zsmb.requirektx.bundle"
 
 kotlin {
     sourceSets {
-        commonMain.dependencies {}
+        commonMain.dependencies {
+            api("org.jetbrains.androidx.core:core-bundle:1.0.0-rc01")
+        }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrayList.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrayList.kt
@@ -2,7 +2,7 @@
 
 package co.zsmb.requirektx
 
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import android.os.Parcelable
 
 /**

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrays.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrays.kt
@@ -2,11 +2,9 @@
 
 package co.zsmb.requirektx
 
-import android.content.Intent
-import android.os.Bundle
 import android.os.Parcelable
 import android.util.SparseArray
-import java.io.Serializable
+import androidx.core.bundle.Bundle
 
 /**
  * Returns the value associated with the given key.

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleImpl.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleImpl.kt
@@ -2,7 +2,7 @@
 
 package co.zsmb.requirektx
 
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 
 /**
  * Returns the value associated with the given key.

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundlePrimitives.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundlePrimitives.kt
@@ -2,9 +2,7 @@
 
 package co.zsmb.requirektx
 
-import android.os.Bundle
-import java.io.Serializable
-import android.os.Parcelable
+import androidx.core.bundle.Bundle
 
 /**
  * Returns the value associated with the given key.

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleReference.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleReference.kt
@@ -3,7 +3,7 @@
 package co.zsmb.requirektx
 
 import android.os.Binder
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import android.os.Parcelable
 import android.util.Size
 import android.util.SizeF

diff --git a/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleArrayListTest.kt b/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleArrayListTest.kt
@@ -2,7 +2,7 @@ package co.zsmb.requirektx
 
 import android.location.Location
 import android.net.Uri
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Test

diff --git a/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleArraysTest.kt b/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleArraysTest.kt
@@ -2,9 +2,8 @@ package co.zsmb.requirektx
 
 import android.location.Location
 import android.net.Uri
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import android.util.SparseArray
-import org.junit.Assert
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows

diff --git a/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundlePrimitivesTest.kt b/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundlePrimitivesTest.kt
@@ -1,6 +1,6 @@
 package co.zsmb.requirektx
 
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Test

diff --git a/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleReferenceTest.kt b/requirektx-bundle/src/androidUnitTest/kotlin/co/zsmb/requirektx/BundleReferenceTest.kt
@@ -3,12 +3,9 @@ package co.zsmb.requirektx
 import android.location.Location
 import android.net.Uri
 import android.os.Binder
-import android.os.Bundle
-import android.util.Size
-import android.util.SizeF
+import androidx.core.bundle.Bundle
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner

diff --git a/requirektx-intent/build.gradle.kts b/requirektx-intent/build.gradle.kts
@@ -8,6 +8,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":requirektx-bundle"))
+            implementation("org.jetbrains.androidx.core:core-bundle:1.0.0-rc01")
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/Intent.kt b/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/Intent.kt
@@ -3,7 +3,7 @@
 package co.zsmb.requirektx
 
 import android.content.Intent
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 
 /**
  * Returns the extras of [this] Intent.

diff --git a/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/IntentExtrasReference.kt b/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/IntentExtrasReference.kt
@@ -3,7 +3,7 @@
 package co.zsmb.requirektx
 
 import android.content.Intent
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import android.os.Parcelable
 import java.io.Serializable
 

diff --git a/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/IntentImpl.kt b/requirektx-intent/src/androidMain/kotlin/co/zsmb/requirektx/IntentImpl.kt
@@ -3,7 +3,7 @@
 package co.zsmb.requirektx
 
 import android.content.Intent
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 
 /**
  * Returns the value associated with the given key.

diff --git a/...irektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentExtrasPrimitivesTest.kt b/...irektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentExtrasPrimitivesTest.kt
@@ -3,7 +3,7 @@ package co.zsmb.requirektx
 import android.content.Intent
 import android.location.Location
 import android.net.Uri
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import org.junit.Assert
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals

diff --git a/requirektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentExtrasReferenceTest.kt b/requirektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentExtrasReferenceTest.kt
@@ -3,7 +3,7 @@ package co.zsmb.requirektx
 import android.content.Intent
 import android.location.Location
 import android.net.Uri
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows
 import org.junit.Test

diff --git a/requirektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentTest.kt b/requirektx-intent/src/androidUnitTest/kotlin/co/zsmb/requirektx/IntentTest.kt
@@ -1,19 +1,10 @@
 package co.zsmb.requirektx
 
 import android.content.Intent
-import android.location.Location
-import android.net.Uri
-import android.os.Bundle
-import org.junit.Assert
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import java.lang.Exception
-import java.util.Calendar
-import java.util.UUID
 
 @RunWith(RobolectricTestRunner::class)
 internal class IntentTest {

diff --git a/requirektx-navigation/src/androidMain/java/co/zsmb/requirektx/NavBackStackEntry.kt b/requirektx-navigation/src/androidMain/java/co/zsmb/requirektx/NavBackStackEntry.kt
@@ -2,7 +2,7 @@
 
 package co.zsmb.requirektx
 
-import android.os.Bundle
+import androidx.core.bundle.Bundle
 import androidx.navigation.NavBackStackEntry
 
 /**