Skip to content

Commit

Permalink
Merge branch '2.x' into refactor-node-parentnode
Browse files Browse the repository at this point in the history
  • Loading branch information
zsoltk committed Jan 16, 2024
2 parents b362c2a + 5fda841 commit de74607
Show file tree
Hide file tree
Showing 34 changed files with 107 additions and 105 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Please refer to [2.0.0-alpha10 – Migration guide](2.0.0-alpha10.md)
- [#642](https://github.com/bumble-tech/appyx/pull/642) – Renamings
- [#643](https://github.com/bumble-tech/appyx/pull/643) – Unify AppyxComponent composable between appyx-navigation and appyx-interactions modules
- [#651](https://github.com/bumble-tech/appyx/pull/651) - Keep only one instance of SaveStateMap typealias and moved it to `com.bumble.appyx.utils.multiplatform` package
- [#652](https://github.com/bumble-tech/appyx/pull/652) - KSP processor renamed from `mutable-ui-processor` to `appyx-processor`
- [#654](https://github.com/bumble-tech/appyx/pull/654) - Renamings
- [#657](https://github.com/bumble-tech/appyx/pull/657) - Rename ParentNode & Node to Node and LeafNode

Expand Down
14 changes: 7 additions & 7 deletions appyx-components/experimental/cards/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions appyx-components/experimental/modal/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions appyx-components/experimental/promoter/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
8 changes: 4 additions & 4 deletions appyx-components/internal/test-drive/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions appyx-components/stable/backstack/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions appyx-components/stable/spotlight/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ kotlin {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
2 changes: 1 addition & 1 deletion demos/appyx-interactions/desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ compose.desktop {
}

dependencies {
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
}
6 changes: 3 additions & 3 deletions demos/appyx-interactions/ios/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ compose.experimental {
}

dependencies {
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions demos/appyx-navigation/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ android {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
6 changes: 3 additions & 3 deletions demos/appyx-navigation/ios/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ tasks.named("compileKotlinIosX64") {
}

dependencies {
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
4 changes: 2 additions & 2 deletions demos/appyx-navigation/web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}

tasks.register<Copy>("copyResources") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
4 changes: 2 additions & 2 deletions demos/mkdocs/appyx-components/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ compose.experimental {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
}
14 changes: 7 additions & 7 deletions demos/sandbox-appyx-navigation/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ android {
}

dependencies {
add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
add("kspAndroid", project(":ksp:mutable-ui-processor"))
add("kspDesktop", project(":ksp:mutable-ui-processor"))
add("kspJs", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspCommonMainMetadata", project(":ksp:appyx-processor"))
add("kspAndroid", project(":ksp:appyx-processor"))
add("kspDesktop", project(":ksp:appyx-processor"))
add("kspJs", project(":ksp:appyx-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
6 changes: 3 additions & 3 deletions demos/sandbox-appyx-navigation/ios/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ compose.experimental {
}

dependencies {
add("kspIosArm64", project(":ksp:mutable-ui-processor"))
add("kspIosX64", project(":ksp:mutable-ui-processor"))
add("kspIosSimulatorArm64", project(":ksp:mutable-ui-processor"))
add("kspIosArm64", project(":ksp:appyx-processor"))
add("kspIosX64", project(":ksp:appyx-processor"))
add("kspIosSimulatorArm64", project(":ksp:appyx-processor"))
}
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ project(":demos:sandbox-appyx-navigation:web").name = "navigation-web"
project(":utils:customisations").name = "utils-customisations"
project(":utils:material3").name = "utils-material3"
project(":utils:multiplatform").name = "utils-multiplatform"
project(":ksp:mutable-ui-processor").name = "appyx-processor"

0 comments on commit de74607

Please sign in to comment.