Skip to content

Commit 9fe1485

Browse files
authored
Rename uikitMain to iosMain (JetBrains#2639)
Partially adresses [CMP-1036](https://youtrack.jetbrains.com/issue/CMP-1036) Align custom source set names Second part of JetBrains#2545 ## Release Notes N/A
1 parent b419332 commit 9fe1485

349 files changed

Lines changed: 13 additions & 69 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/compose-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Run iOS Utils Tests
8888
timeout-minutes: 15
8989
shell: bash
90-
working-directory: compose/ui/ui-uikit/src/uikitMain/objc/CMPUIKitUtils
90+
working-directory: compose/ui/ui-uikit/src/iosMain/objc/CMPUIKitUtils
9191
run: |
9292
xcodebuild test \
9393
-resultBundlePath TestResults.xcresult \
@@ -100,7 +100,7 @@ jobs:
100100
if: failure()
101101
with:
102102
name: TestResults-${{ github.run_number }}.xcresult
103-
path: compose/ui/ui-uikit/src/uikitMain/objc/CMPUIKitUtils/TestResults.xcresult
103+
path: compose/ui/ui-uikit/src/iosMain/objc/CMPUIKitUtils/TestResults.xcresult
104104

105105
compose-ios-instrumented-tests:
106106
runs-on: macos-15-xlarge

compose/foundation/foundation/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,13 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
137137
nativeMain.dependsOn(nonJvmMain)
138138
webMain.dependsOn(nonJvmMain)
139139
iosMain {
140-
kotlin.srcDir("src/uikitMain/kotlin")
141-
resources.srcDir("src/uikitMain/resources")
140+
dependsOn(nativeMain)
142141
dependencies {
143142
implementation(project(":compose:ui:ui-uikit"))
144143
}
145144
}
146145
iosTest {
147-
kotlin.srcDir("src/uikitTest/kotlin")
148-
resources.srcDir("src/uikitTest/resources")
146+
dependsOn(nativeTest)
149147
}
150148
jsMain {
151149
dependsOn(webMain)

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/Clickable.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/Clickable.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/Magnifier.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/Magnifier.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/Overscroll.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/Overscroll.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/PlatformMagnifier.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/PlatformMagnifier.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/RequestFocusOnClick.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/cupertino/CupertinoOverscrollEffect.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/cupertino/CupertinoOverscrollEffect.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/cupertino/CupertinoScrollDecayAnimationSpec.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/cupertino/CupertinoScrollDecayAnimationSpec.ios.kt

File renamed without changes.

compose/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/gestures/Scrollable.uikit.kt renamed to compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/gestures/Scrollable.ios.kt

File renamed without changes.

0 commit comments

Comments
 (0)