Repository: cashapp/redwood
Pull request #631 (2022-12-14 19:19:36)

Move all core artifacts to the root
This works around a bug in Kotlin/JS in that it uses the project name rather than something we can control such as `archivesBaseName`. We aren't hitting the bug currently, but a forthcoming change will. Fixing it separately to keep this change and that change small.


Patch:
diff --git a/redwood-layout-composeui/build.gradle b/redwood-layout-composeui/build.gradle
index 9a387d8c1..2ce7657b4 100644
--- a/redwood-layout-composeui/build.gradle
+++ b/redwood-layout-composeui/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'com.vanniktech.maven.publish'
 apply plugin: 'org.jetbrains.dokka' // Must be applied here for publish plugin.
 
 dependencies {
-  api projects.redwoodLayoutSchema.widget
+  api projects.redwoodLayoutWidget
   implementation projects.redwoodFlexbox
   implementation projects.redwoodWidgetCompose
   implementation libs.androidx.core
diff --git a/redwood-layout-schema/layout-modifiers/build.gradle b/redwood-layout-layoutmodifiers/build.gradle
similarity index 100%
rename from redwood-layout-schema/layout-modifiers/build.gradle
rename to redwood-layout-layoutmodifiers/build.gradle
diff --git a/redwood-layout-layoutmodifiers/gradle.properties b/redwood-layout-layoutmodifiers/gradle.properties
new file mode 100644
index 000000000..ba74bc1fa
--- /dev/null
+++ b/redwood-layout-layoutmodifiers/gradle.properties
@@ -0,0 +1,2 @@
+POM_ARTIFACT_ID=redwood-layout-layoutmodifiers
+POM_NAME=Redwood Layout: Layout Modifiers
diff --git a/redwood-layout-schema/layout-modifiers/gradle.properties b/redwood-layout-schema/layout-modifiers/gradle.properties
deleted file mode 100644
index 052123820..000000000
--- a/redwood-layout-schema/layout-modifiers/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-POM_ARTIFACT_ID=redwood-layout-modifiers
-POM_NAME=Redwood Layout Modifiers
diff --git a/redwood-layout-uiview/build.gradle b/redwood-layout-uiview/build.gradle
index b6a95eb27..0df8c76b6 100644
--- a/redwood-layout-uiview/build.gradle
+++ b/redwood-layout-uiview/build.gradle
@@ -13,7 +13,7 @@ kotlin {
     commonMain {
       kotlin.srcDir(FlexboxHelpers.get(tasks, 'app.cash.redwood.layout.uiview'))
       dependencies {
-        api projects.redwoodLayoutSchema.widget
+        api projects.redwoodLayoutWidget
         implementation projects.redwoodFlexbox
         implementation projects.redwoodWidgetCompose
       }
diff --git a/redwood-layout-view/build.gradle b/redwood-layout-view/build.gradle
index c548da5cd..7832c3eae 100644
--- a/redwood-layout-view/build.gradle
+++ b/redwood-layout-view/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'com.vanniktech.maven.publish'
 apply plugin: 'org.jetbrains.dokka' // Must be applied here for publish plugin.
 
 dependencies {
-  api projects.redwoodLayoutSchema.widget
+  api projects.redwoodLayoutWidget
   implementation projects.redwoodFlexbox
   implementation libs.androidx.core
   testImplementation projects.redwoodLayoutSharedTest
diff --git a/redwood-layout-schema/widget/build.gradle b/redwood-layout-widget/build.gradle
similarity index 89%
rename from redwood-layout-schema/widget/build.gradle
rename to redwood-layout-widget/build.gradle
index 330be8013..eb6737166 100644
--- a/redwood-layout-schema/widget/build.gradle
+++ b/redwood-layout-widget/build.gradle
@@ -9,7 +9,7 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api projects.redwoodLayoutSchema.layoutModifiers
+        api projects.redwoodLayoutLayoutmodifiers
       }
     }
   }
diff --git a/redwood-layout-schema/widget/gradle.properties b/redwood-layout-widget/gradle.properties
similarity index 100%
rename from redwood-layout-schema/widget/gradle.properties
rename to redwood-layout-widget/gradle.properties
diff --git a/redwood-treehouse-lazylayout-composeui/build.gradle b/redwood-treehouse-lazylayout-composeui/build.gradle
index 04c26f49e..854be09f2 100644
--- a/redwood-treehouse-lazylayout-composeui/build.gradle
+++ b/redwood-treehouse-lazylayout-composeui/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'org.jetbrains.dokka' // Must be applied here for publish plugin.
 
 dependencies {
   api projects.redwoodTreehouseComposeui
-  api projects.redwoodTreehouseLazylayoutSchema.widget
+  api projects.redwoodTreehouseLazylayoutWidget
   implementation projects.redwoodWidgetCompose
   implementation libs.androidx.core
   implementation libs.androidx.compose.foundation
diff --git a/redwood-treehouse-lazylayout-uiview/build.gradle b/redwood-treehouse-lazylayout-uiview/build.gradle
index ef46f18e8..41f1fa1af 100644
--- a/redwood-treehouse-lazylayout-uiview/build.gradle
+++ b/redwood-treehouse-lazylayout-uiview/build.gradle
@@ -10,7 +10,7 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api projects.redwoodTreehouseLazylayoutSchema.widget
+        api projects.redwoodTreehouseLazylayoutWidget
         implementation projects.redwoodWidgetCompose
       }
     }
diff --git a/redwood-treehouse-lazylayout-view/build.gradle b/redwood-treehouse-lazylayout-view/build.gradle
index 576e49fed..b7a7a7d99 100644
--- a/redwood-treehouse-lazylayout-view/build.gradle
+++ b/redwood-treehouse-lazylayout-view/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.vanniktech.maven.publish'
 apply plugin: 'org.jetbrains.dokka' // Must be applied here for publish plugin.
 
 dependencies {
-  api projects.redwoodTreehouseLazylayoutSchema.widget
+  api projects.redwoodTreehouseLazylayoutWidget
   implementation libs.androidx.core
   implementation libs.androidx.recyclerview
 }
diff --git a/redwood-treehouse-lazylayout-schema/widget/build.gradle b/redwood-treehouse-lazylayout-widget/build.gradle
similarity index 100%
rename from redwood-treehouse-lazylayout-schema/widget/build.gradle
rename to redwood-treehouse-lazylayout-widget/build.gradle
diff --git a/redwood-treehouse-lazylayout-schema/widget/gradle.properties b/redwood-treehouse-lazylayout-widget/gradle.properties
similarity index 100%
rename from redwood-treehouse-lazylayout-schema/widget/gradle.properties
rename to redwood-treehouse-lazylayout-widget/gradle.properties
diff --git a/samples/emoji-search/ios/app/EmojiSearchApp/IosEmojiSearchWidgetFactory.swift b/samples/emoji-search/ios/app/EmojiSearchApp/IosEmojiSearchWidgetFactory.swift
index 6c143ed8a..2948df447 100644
--- a/samples/emoji-search/ios/app/EmojiSearchApp/IosEmojiSearchWidgetFactory.swift
+++ b/samples/emoji-search/ios/app/EmojiSearchApp/IosEmojiSearchWidgetFactory.swift
@@ -24,9 +24,9 @@ class IosEmojiSearchWidgetFactory<A : AnyObject>: WidgetEmojiSearchWidgetFactory
     let widgetSystem: Redwood_treehouseTreehouseViewWidgetSystem
     let imageLoader = RemoteImageLoader()
 
-    var RedwoodLayout: WidgetRedwoodLayoutWidgetFactory =
+    var RedwoodLayout: Redwood_layout_widgetRedwoodLayoutWidgetFactory =
         Redwood_layout_uiviewUIViewRedwoodLayoutWidgetFactory(viewFactory: UIScrollViewFactory())
-    var RedwoodTreehouseLazyLayout: WidgetRedwoodTreehouseLazyLayoutWidgetFactory
+    var RedwoodTreehouseLazyLayout: Redwood_treehouse_lazylayout_widgetRedwoodTreehouseLazyLayoutWidgetFactory
 
     init(treehouseApp: Redwood_treehouseTreehouseApp<A>, widgetSystem: Redwood_treehouseTreehouseViewWidgetSystem) {
         self.treehouseApp = treehouseApp
diff --git a/samples/emoji-search/schema/widget/build.gradle b/samples/emoji-search/schema/widget/build.gradle
index bcbe0321c..8f7b39381 100644
--- a/samples/emoji-search/schema/widget/build.gradle
+++ b/samples/emoji-search/schema/widget/build.gradle
@@ -17,8 +17,8 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api projects.redwoodLayoutSchema.widget
-        api projects.redwoodTreehouseLazylayoutSchema.widget
+        api projects.redwoodLayoutWidget
+        api projects.redwoodTreehouseLazylayoutWidget
         api projects.samples.emojiSearch.values
       }
     }
diff --git a/samples/emoji-search/schema/widget/protocol/build.gradle b/samples/emoji-search/schema/widget/protocol/build.gradle
index 0d99ee444..c77387a4f 100644
--- a/samples/emoji-search/schema/widget/protocol/build.gradle
+++ b/samples/emoji-search/schema/widget/protocol/build.gradle
@@ -14,7 +14,7 @@ kotlin {
     commonMain {
       dependencies {
         api projects.samples.emojiSearch.schema.widget
-        api projects.redwoodLayoutSchema.widget
+        api projects.redwoodLayoutWidget
       }
     }
   }
diff --git a/settings.gradle b/settings.gradle
index 980aaaa97..59728f313 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,12 +6,12 @@ include ':redwood-flexbox'
 include ':redwood-gradle-plugin'
 include ':redwood-layout-api'
 include ':redwood-layout-composeui'
+include ':redwood-layout-layoutmodifiers'
 include ':redwood-layout-schema'
-include ':redwood-layout-schema:layout-modifiers'
-include ':redwood-layout-schema:widget'
 include ':redwood-layout-shared-test'
 include ':redwood-layout-uiview'
 include ':redwood-layout-view'
+include ':redwood-layout-widget'
 include ':redwood-protocol'
 include ':redwood-protocol-compose'
 include ':redwood-protocol-widget'
@@ -25,9 +25,9 @@ include ':redwood-treehouse-composeui'
 include ':redwood-treehouse-lazylayout-api'
 include ':redwood-treehouse-lazylayout-composeui'
 include ':redwood-treehouse-lazylayout-schema'
-include ':redwood-treehouse-lazylayout-schema:widget'
 include ':redwood-treehouse-lazylayout-uiview'
 include ':redwood-treehouse-lazylayout-view'
+include ':redwood-treehouse-lazylayout-widget'
 include ':redwood-widget'
 include ':redwood-widget-compose'
 


Test patch:
diff --git a/redwood-layout-shared-test/build.gradle b/redwood-layout-shared-test/build.gradle
index 74cdaba40..1c2f2c3b0 100644
--- a/redwood-layout-shared-test/build.gradle
+++ b/redwood-layout-shared-test/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'org.jetbrains.kotlin.android'
 dependencies {
   api projects.redwoodFlexbox
   api projects.redwoodLayoutApi
-  api projects.redwoodLayoutSchema.layoutModifiers
+  api projects.redwoodLayoutLayoutmodifiers
   api projects.redwoodRuntime
   api projects.redwoodWidget
   api libs.junit
diff --git a/test-schema/widget/build.gradle b/test-schema/widget/build.gradle
index 356e4fa2f..763d0ee7b 100644
--- a/test-schema/widget/build.gradle
+++ b/test-schema/widget/build.gradle
@@ -7,7 +7,7 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api projects.redwoodLayoutSchema.widget
+        api projects.redwoodLayoutWidget
       }
     }
   }