Merge pull request #8 from bumble-tech/move-rx-package-to-interop

Rename interop and testing modules
bumble-tech · Jul 4, 2022 · cd82a66 · cd82a66
2 parents 3697c2d + a6770b3
commit cd82a66
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -58,8 +58,8 @@ dependencies {
     implementation libs.compose.ui.ui
     implementation libs.google.accompanist.flow
     implementation libs.google.material
+    implementation project(':interop-rx2')
 
-    implementation project(':rx2')
     implementation libs.rxjava2
     implementation libs.rxrelay
 

diff --git a/interop/.gitignore → interop-ribs/.gitignore b/interop/.gitignore → interop-ribs/.gitignore
diff --git a/interop/build.gradle → interop-ribs/build.gradle b/interop/build.gradle → interop-ribs/build.gradle
@@ -6,7 +6,7 @@ plugins {
 apply from: '../gradle/publication.gradle'
 
 android {
-    namespace = 'com.bumble.appyx.interop'
+    namespace = 'com.bumble.appyx.interop.ribs'
     compileSdk 32
 
     defaultConfig {

diff --git a/...bumble/appyx/interop/ribs/ContextUtils.kt → ...bumble/appyx/interop/ribs/ContextUtils.kt b/...bumble/appyx/interop/ribs/ContextUtils.kt → ...bumble/appyx/interop/ribs/ContextUtils.kt
diff --git a/...rop/ribs/IntegrationPointAppyxProvider.kt → ...rop/ribs/IntegrationPointAppyxProvider.kt b/...rop/ribs/IntegrationPointAppyxProvider.kt → ...rop/ribs/IntegrationPointAppyxProvider.kt
diff --git a/...ble/appyx/interop/ribs/InteropActivity.kt → ...ble/appyx/interop/ribs/InteropActivity.kt b/...ble/appyx/interop/ribs/InteropActivity.kt → ...ble/appyx/interop/ribs/InteropActivity.kt
diff --git a/...mble/appyx/interop/ribs/InteropBuilder.kt → ...mble/appyx/interop/ribs/InteropBuilder.kt b/...mble/appyx/interop/ribs/InteropBuilder.kt → ...mble/appyx/interop/ribs/InteropBuilder.kt
diff --git a/.../bumble/appyx/interop/ribs/InteropNode.kt → .../bumble/appyx/interop/ribs/InteropNode.kt b/.../bumble/appyx/interop/ribs/InteropNode.kt → .../bumble/appyx/interop/ribs/InteropNode.kt
diff --git a/.../bumble/appyx/interop/ribs/InteropView.kt → .../bumble/appyx/interop/ribs/InteropView.kt b/.../bumble/appyx/interop/ribs/InteropView.kt → .../bumble/appyx/interop/ribs/InteropView.kt
@@ -41,7 +41,7 @@ internal class InteropView private constructor(
         return if (activity is IntegrationPointAppyxProvider) {
             activity.integrationPointAppyx
         } else {
-            throw IllegalStateException("Activity where InteropNode is used must implement IntegrationPointV2Provider")
+            throw IllegalStateException("Activity where InteropNode is used must implement IntegrationPointAppyxProvider")
         }
     }
 

diff --git a/rx2/.gitignore → interop-rx2/.gitignore b/rx2/.gitignore → interop-rx2/.gitignore
diff --git a/rx2/build.gradle → interop-rx2/build.gradle b/rx2/build.gradle → interop-rx2/build.gradle
@@ -6,7 +6,7 @@ plugins {
 apply from: '../gradle/publication.gradle'
 
 android {
-    namespace = 'com.bumble.appyx.rx2'
+    namespace = 'com.bumble.appyx.interop.rx2'
     compileSdk 32
 
     defaultConfig {

diff --git a/...mble/appyx/connectable/rx2/Connectable.kt → ...mble/appyx/connectable/rx2/Connectable.kt b/...mble/appyx/connectable/rx2/Connectable.kt → ...mble/appyx/connectable/rx2/Connectable.kt
diff --git a/...le/appyx/connectable/rx2/NodeConnector.kt → ...le/appyx/connectable/rx2/NodeConnector.kt b/...le/appyx/connectable/rx2/NodeConnector.kt → ...le/appyx/connectable/rx2/NodeConnector.kt
diff --git a/...ppyx/connectable/rx2/NodeConnectorTest.kt → ...ppyx/connectable/rx2/NodeConnectorTest.kt b/...ppyx/connectable/rx2/NodeConnectorTest.kt → ...ppyx/connectable/rx2/NodeConnectorTest.kt
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
@@ -50,10 +50,10 @@ android {
 
 dependencies {
     implementation project(':core')
-    implementation project(':rx2')
-    implementation project(':interop')
+    implementation project(':interop-rx2')
+    implementation project(':interop-ribs')
     implementation project(':routing-source-addons')
-    implementation project(':testing')
+    implementation project(':testing-ui')
 
     implementation libs.androidx.activity.compose
     implementation libs.androidx.appcompat

diff --git a/settings.gradle b/settings.gradle
@@ -12,7 +12,7 @@ enableFeaturePreview 'VERSION_CATALOGS'
 include ':app',
         ':core',
         ':sandbox',
-        ':rx2',
-        ':interop',
-        'testing',
+        ':interop-rx2',
+        ':interop-ribs',
+        'testing-ui',
         ':routing-source-addons'
diff --git a/testing/.gitignore → testing-ui/.gitignore b/testing/.gitignore → testing-ui/.gitignore
diff --git a/testing/build.gradle → testing-ui/build.gradle b/testing/build.gradle → testing-ui/build.gradle
@@ -6,7 +6,7 @@ plugins {
 apply from: '../gradle/publication.gradle'
 
 android {
-    namespace 'com.bumble.appyx.testing'
+    namespace 'com.bumble.appyx.testing.ui'
     compileSdk 32
 
     defaultConfig {

diff --git a/testing/src/main/AndroidManifest.xml → testing-ui/src/main/AndroidManifest.xml b/testing/src/main/AndroidManifest.xml → testing-ui/src/main/AndroidManifest.xml
diff --git a/...sting/ui/rules/AppyxParentViewTestRule.kt → ...sting/ui/rules/AppyxParentViewTestRule.kt b/...sting/ui/rules/AppyxParentViewTestRule.kt → ...sting/ui/rules/AppyxParentViewTestRule.kt
diff --git a/...pyx/testing/ui/rules/AppyxViewActivity.kt → ...pyx/testing/ui/rules/AppyxViewActivity.kt b/...pyx/testing/ui/rules/AppyxViewActivity.kt → ...pyx/testing/ui/rules/AppyxViewActivity.kt
diff --git a/...pyx/testing/ui/rules/AppyxViewTestRule.kt → ...pyx/testing/ui/rules/AppyxViewTestRule.kt b/...pyx/testing/ui/rules/AppyxViewTestRule.kt → ...pyx/testing/ui/rules/AppyxViewTestRule.kt
diff --git a/...bumble/appyx/testing/ui/rules/RunRules.kt → ...bumble/appyx/testing/ui/rules/RunRules.kt b/...bumble/appyx/testing/ui/rules/RunRules.kt → ...bumble/appyx/testing/ui/rules/RunRules.kt
diff --git a/...appyx/testing/ui/utils/DummyParentNode.kt → ...appyx/testing/ui/utils/DummyParentNode.kt b/...appyx/testing/ui/utils/DummyParentNode.kt → ...appyx/testing/ui/utils/DummyParentNode.kt
diff --git a/...yx/testing/ui/utils/DummyRoutingSource.kt → ...yx/testing/ui/utils/DummyRoutingSource.kt b/...yx/testing/ui/utils/DummyRoutingSource.kt → ...yx/testing/ui/utils/DummyRoutingSource.kt