From f9770f8ff4ac7dd7804e388382bf53efc6a9bfc2 Mon Sep 17 00:00:00 2001
From: Aashay Gaikwad <aashay.gaikwad@team.bumble.com>
Date: Fri, 9 Feb 2024 15:27:53 +0000
Subject: [PATCH] Moved Builder, SimpleBuilder, Interactor to separate module

---
 settings.gradle.kts                             |  1 +
 utils/ribs-helpers/build.gradle.kts             | 17 +++++++++++++++++
 utils/ribs-helpers/lint-baseline.xml            |  4 ++++
 .../appyx/utils/ribshelpers}/builder/Builder.kt |  2 +-
 .../utils/ribshelpers}/builder/SimpleBuilder.kt |  2 +-
 .../utils/ribshelpers}/interactor/Interactor.kt |  2 +-
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 utils/ribs-helpers/build.gradle.kts
 create mode 100644 utils/ribs-helpers/lint-baseline.xml
 rename {appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation => utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers}/builder/Builder.kt (85%)
 rename {appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation => utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers}/builder/SimpleBuilder.kt (85%)
 rename {appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/clienthelper => utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers}/interactor/Interactor.kt (90%)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 207e2c844..b626ac48c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -85,6 +85,7 @@ include(
     ":utils:interop-ribs",
     ":utils:interop-rx2",
     ":utils:interop-rx3",
+    ":utils:ribs-helpers",
     ":utils:testing-junit4",
     ":utils:testing-junit5",
     ":utils:testing-ui",
diff --git a/utils/ribs-helpers/build.gradle.kts b/utils/ribs-helpers/build.gradle.kts
new file mode 100644
index 000000000..f6b4225b6
--- /dev/null
+++ b/utils/ribs-helpers/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("com.bumble.appyx.android.library")
+    id("appyx-publish-android")
+}
+
+publishingPlugin {
+    artifactId = "utils-ribs-helpers"
+}
+
+appyx {
+    namespace.set("com.bumble.appyx.utils.ribs.helpers")
+}
+
+dependencies {
+    api(project(":appyx-navigation:appyx-navigation"))
+    api(project(":appyx-interactions:appyx-interactions"))
+}
diff --git a/utils/ribs-helpers/lint-baseline.xml b/utils/ribs-helpers/lint-baseline.xml
new file mode 100644
index 000000000..3755e80a7
--- /dev/null
+++ b/utils/ribs-helpers/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.1.3" type="baseline" client="gradle" dependencies="false" name="AGP (7.1.3)" variant="all" version="7.1.3">
+
+</issues>
diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/Builder.kt b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/Builder.kt
similarity index 85%
rename from appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/Builder.kt
rename to utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/Builder.kt
index 0d785e9a2..43958b193 100644
--- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/Builder.kt
+++ b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/Builder.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.builder
+package com.bumble.appyx.utils.ribshelpers.builder
 
 import com.bumble.appyx.navigation.modality.NodeContext
 import com.bumble.appyx.navigation.node.Node
diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/SimpleBuilder.kt b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/SimpleBuilder.kt
similarity index 85%
rename from appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/SimpleBuilder.kt
rename to utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/SimpleBuilder.kt
index c13dfa1ed..225501a1a 100644
--- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/builder/SimpleBuilder.kt
+++ b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/builder/SimpleBuilder.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.builder
+package com.bumble.appyx.utils.ribshelpers.builder
 
 import com.bumble.appyx.navigation.modality.NodeContext
 import com.bumble.appyx.navigation.node.Node
diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/clienthelper/interactor/Interactor.kt b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt
similarity index 90%
rename from appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/clienthelper/interactor/Interactor.kt
rename to utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt
index ec40fe7e2..e0182aca9 100644
--- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/clienthelper/interactor/Interactor.kt
+++ b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.clienthelper.interactor
+package com.bumble.appyx.utils.ribshelpers.interactor
 
 import com.bumble.appyx.interactions.core.plugin.SavesInstanceState
 import com.bumble.appyx.navigation.children.ChildAware