From 7b113bf8c40be5724194aa8ed05b2ff3eacd6397 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 17 Mar 2019 17:21:02 +0100 Subject: [PATCH] Move AndroidManifest and resource files --- buildSrc/src/main/kotlin/AndroidLibraryConfig.kt | 4 ++++ .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../res/values/amber_swatch.xml | 0 .../res/values/blue_grey_swatch.xml | 0 .../res/values/blue_swatch.xml | 0 .../res/values/brown_swatch.xml | 0 .../res/values/cyan_swatch.xml | 0 .../res/values/deep_orange_swatch.xml | 0 .../res/values/deep_purple_swatch.xml | 0 .../res/values/green_swatch.xml | 0 .../res/values/grey_swatch.xml | 0 .../res/values/indigo_swatch.xml | 0 .../res/values/light_blue_swatch.xml | 0 .../res/values/light_green_swatch.xml | 0 .../res/values/lime_swatch.xml | 0 .../res/values/orange_swatch.xml | 0 .../res/values/pink_swatch.xml | 0 .../res/values/purple_swatch.xml | 0 .../res/values/red_swatch.xml | 0 .../res/values/teal_swatch.xml | 0 .../res/values/yellow_swatch.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../res/values/view_ids.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 modules/typesaferecyclerview/build.gradle.kts | 15 ++------------- .../{main => androidMain}/AndroidManifest.xml | 0 .../typesaferecyclerview/ViewHolder.java | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/res/values/attrs.xml | 0 .../{main => androidMain}/res/values/styles.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/res/values/attrs.xml | 0 .../res/values/parameters.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/res/values/attrs.xml | 0 .../{main => androidMain}/res/values/styles.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../res/layout/recyclerview_with_scrollbars.xml | 0 .../{main => androidMain}/res/values/styles.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../permissions/PermissionsExampleActivity.kt | 7 ++++++- .../res/drawable/ic_bug_report_white_24dp.xml | 0 .../res/drawable/ic_computer_white_24dp.xml | 0 .../res/drawable/ic_favorite_white_24dp.xml | 0 .../res/drawable/ic_invert_colors_white_24dp.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/values-night/styles.xml | 0 .../res/values-w820dp/dimens.xml | 0 .../{main => androidMain}/res/values/colors.xml | 0 .../{main => androidMain}/res/values/dimens.xml | 0 .../res/values/menu_ids.xml | 0 .../{main => androidMain}/res/values/strings.xml | 0 .../{main => androidMain}/res/values/styles.xml | 0 .../res/values/view_ids.xml | 0 92 files changed, 12 insertions(+), 14 deletions(-) rename modules/activities/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/alertdialog-appcompat/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/alertdialog/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/appctx/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/arch-lifecycle/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/arch-room/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/bundle/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/checkedlazy/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/dimensions/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/exceptions/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/fragmentargs/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/fragments/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/initprovider/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/intents/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/lifecycle-coroutines/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/mainhandler/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/mainthread/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/material-colors/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/amber_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/blue_grey_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/blue_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/brown_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/cyan_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/deep_orange_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/deep_purple_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/green_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/grey_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/indigo_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/light_blue_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/light_green_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/lime_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/orange_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/pink_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/purple_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/red_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/teal_swatch.xml (100%) rename modules/material-colors/src/{main => androidMain}/res/values/yellow_swatch.xml (100%) rename modules/material-lists/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/material-lists/src/{main => androidMain}/res/values/view_ids.xml (100%) rename modules/preferences/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/resources/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/snackbar/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/stetho-init/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/systemservices/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/toast/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/typesaferecyclerview/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/typesaferecyclerview/src/{main => androidMain}/java/splitties/typesaferecyclerview/ViewHolder.java (100%) rename modules/views-appcompat/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-cardview/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-coroutines/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-appcompat/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-appcompat/src/{main => androidMain}/res/values/attrs.xml (100%) rename modules/views-dsl-appcompat/src/{main => androidMain}/res/values/styles.xml (100%) rename modules/views-dsl-constraintlayout/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-coordinatorlayout/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-ide-preview/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-ide-preview/src/{main => androidMain}/res/values/attrs.xml (100%) rename modules/views-dsl-ide-preview/src/{main => androidMain}/res/values/parameters.xml (100%) rename modules/views-dsl-material/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-material/src/{main => androidMain}/res/values/attrs.xml (100%) rename modules/views-dsl-material/src/{main => androidMain}/res/values/styles.xml (100%) rename modules/views-dsl-recyclerview/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-dsl-recyclerview/src/{main => androidMain}/res/layout/recyclerview_with_scrollbars.xml (100%) rename modules/views-dsl-recyclerview/src/{main => androidMain}/res/values/styles.xml (100%) rename modules/views-dsl/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-material/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-recyclerview/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-selectable-appcompat/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-selectable-constraintlayout/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views-selectable/src/{main => androidMain}/AndroidManifest.xml (100%) rename modules/views/src/{main => androidMain}/AndroidManifest.xml (100%) rename sample/src/{main => androidMain}/AndroidManifest.xml (100%) rename sample/src/{main => androidMain}/res/drawable/ic_bug_report_white_24dp.xml (100%) rename sample/src/{main => androidMain}/res/drawable/ic_computer_white_24dp.xml (100%) rename sample/src/{main => androidMain}/res/drawable/ic_favorite_white_24dp.xml (100%) rename sample/src/{main => androidMain}/res/drawable/ic_invert_colors_white_24dp.xml (100%) rename sample/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher.png (100%) rename sample/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher.png (100%) rename sample/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher.png (100%) rename sample/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename sample/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename sample/src/{main => androidMain}/res/values-night/styles.xml (100%) rename sample/src/{main => androidMain}/res/values-w820dp/dimens.xml (100%) rename sample/src/{main => androidMain}/res/values/colors.xml (100%) rename sample/src/{main => androidMain}/res/values/dimens.xml (100%) rename sample/src/{main => androidMain}/res/values/menu_ids.xml (100%) rename sample/src/{main => androidMain}/res/values/strings.xml (100%) rename sample/src/{main => androidMain}/res/values/styles.xml (100%) rename sample/src/{main => androidMain}/res/values/view_ids.xml (100%) diff --git a/buildSrc/src/main/kotlin/AndroidLibraryConfig.kt b/buildSrc/src/main/kotlin/AndroidLibraryConfig.kt index 112703af2..483f48a4e 100644 --- a/buildSrc/src/main/kotlin/AndroidLibraryConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidLibraryConfig.kt @@ -20,6 +20,10 @@ fun AndroidLibraryExtension.setDefaults() { isMinifyEnabled = false } } + sourceSets.getByName("main") { + manifest.srcFile("src/androidMain/AndroidManifest.xml") + res.srcDir("src/androidMain/res") + } // TODO replace with https://issuetracker.google.com/issues/72050365 once released. libraryVariants.all(Action { generateBuildConfigProvider.configure { diff --git a/modules/activities/src/main/AndroidManifest.xml b/modules/activities/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/activities/src/main/AndroidManifest.xml rename to modules/activities/src/androidMain/AndroidManifest.xml diff --git a/modules/alertdialog-appcompat/src/main/AndroidManifest.xml b/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/alertdialog-appcompat/src/main/AndroidManifest.xml rename to modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml diff --git a/modules/alertdialog/src/main/AndroidManifest.xml b/modules/alertdialog/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/alertdialog/src/main/AndroidManifest.xml rename to modules/alertdialog/src/androidMain/AndroidManifest.xml diff --git a/modules/appctx/src/main/AndroidManifest.xml b/modules/appctx/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/appctx/src/main/AndroidManifest.xml rename to modules/appctx/src/androidMain/AndroidManifest.xml diff --git a/modules/arch-lifecycle/src/main/AndroidManifest.xml b/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/arch-lifecycle/src/main/AndroidManifest.xml rename to modules/arch-lifecycle/src/androidMain/AndroidManifest.xml diff --git a/modules/arch-room/src/main/AndroidManifest.xml b/modules/arch-room/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/arch-room/src/main/AndroidManifest.xml rename to modules/arch-room/src/androidMain/AndroidManifest.xml diff --git a/modules/bundle/src/main/AndroidManifest.xml b/modules/bundle/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/bundle/src/main/AndroidManifest.xml rename to modules/bundle/src/androidMain/AndroidManifest.xml diff --git a/modules/checkedlazy/src/main/AndroidManifest.xml b/modules/checkedlazy/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/checkedlazy/src/main/AndroidManifest.xml rename to modules/checkedlazy/src/androidMain/AndroidManifest.xml diff --git a/modules/dimensions/src/main/AndroidManifest.xml b/modules/dimensions/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/dimensions/src/main/AndroidManifest.xml rename to modules/dimensions/src/androidMain/AndroidManifest.xml diff --git a/modules/exceptions/src/main/AndroidManifest.xml b/modules/exceptions/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/exceptions/src/main/AndroidManifest.xml rename to modules/exceptions/src/androidMain/AndroidManifest.xml diff --git a/modules/fragmentargs/src/main/AndroidManifest.xml b/modules/fragmentargs/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/fragmentargs/src/main/AndroidManifest.xml rename to modules/fragmentargs/src/androidMain/AndroidManifest.xml diff --git a/modules/fragments/src/main/AndroidManifest.xml b/modules/fragments/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/fragments/src/main/AndroidManifest.xml rename to modules/fragments/src/androidMain/AndroidManifest.xml diff --git a/modules/initprovider/src/main/AndroidManifest.xml b/modules/initprovider/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/initprovider/src/main/AndroidManifest.xml rename to modules/initprovider/src/androidMain/AndroidManifest.xml diff --git a/modules/intents/src/main/AndroidManifest.xml b/modules/intents/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/intents/src/main/AndroidManifest.xml rename to modules/intents/src/androidMain/AndroidManifest.xml diff --git a/modules/lifecycle-coroutines/src/main/AndroidManifest.xml b/modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/lifecycle-coroutines/src/main/AndroidManifest.xml rename to modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml diff --git a/modules/mainhandler/src/main/AndroidManifest.xml b/modules/mainhandler/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/mainhandler/src/main/AndroidManifest.xml rename to modules/mainhandler/src/androidMain/AndroidManifest.xml diff --git a/modules/mainthread/src/main/AndroidManifest.xml b/modules/mainthread/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/mainthread/src/main/AndroidManifest.xml rename to modules/mainthread/src/androidMain/AndroidManifest.xml diff --git a/modules/material-colors/src/main/AndroidManifest.xml b/modules/material-colors/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/material-colors/src/main/AndroidManifest.xml rename to modules/material-colors/src/androidMain/AndroidManifest.xml diff --git a/modules/material-colors/src/main/res/values/amber_swatch.xml b/modules/material-colors/src/androidMain/res/values/amber_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/amber_swatch.xml rename to modules/material-colors/src/androidMain/res/values/amber_swatch.xml diff --git a/modules/material-colors/src/main/res/values/blue_grey_swatch.xml b/modules/material-colors/src/androidMain/res/values/blue_grey_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/blue_grey_swatch.xml rename to modules/material-colors/src/androidMain/res/values/blue_grey_swatch.xml diff --git a/modules/material-colors/src/main/res/values/blue_swatch.xml b/modules/material-colors/src/androidMain/res/values/blue_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/blue_swatch.xml rename to modules/material-colors/src/androidMain/res/values/blue_swatch.xml diff --git a/modules/material-colors/src/main/res/values/brown_swatch.xml b/modules/material-colors/src/androidMain/res/values/brown_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/brown_swatch.xml rename to modules/material-colors/src/androidMain/res/values/brown_swatch.xml diff --git a/modules/material-colors/src/main/res/values/cyan_swatch.xml b/modules/material-colors/src/androidMain/res/values/cyan_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/cyan_swatch.xml rename to modules/material-colors/src/androidMain/res/values/cyan_swatch.xml diff --git a/modules/material-colors/src/main/res/values/deep_orange_swatch.xml b/modules/material-colors/src/androidMain/res/values/deep_orange_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/deep_orange_swatch.xml rename to modules/material-colors/src/androidMain/res/values/deep_orange_swatch.xml diff --git a/modules/material-colors/src/main/res/values/deep_purple_swatch.xml b/modules/material-colors/src/androidMain/res/values/deep_purple_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/deep_purple_swatch.xml rename to modules/material-colors/src/androidMain/res/values/deep_purple_swatch.xml diff --git a/modules/material-colors/src/main/res/values/green_swatch.xml b/modules/material-colors/src/androidMain/res/values/green_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/green_swatch.xml rename to modules/material-colors/src/androidMain/res/values/green_swatch.xml diff --git a/modules/material-colors/src/main/res/values/grey_swatch.xml b/modules/material-colors/src/androidMain/res/values/grey_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/grey_swatch.xml rename to modules/material-colors/src/androidMain/res/values/grey_swatch.xml diff --git a/modules/material-colors/src/main/res/values/indigo_swatch.xml b/modules/material-colors/src/androidMain/res/values/indigo_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/indigo_swatch.xml rename to modules/material-colors/src/androidMain/res/values/indigo_swatch.xml diff --git a/modules/material-colors/src/main/res/values/light_blue_swatch.xml b/modules/material-colors/src/androidMain/res/values/light_blue_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/light_blue_swatch.xml rename to modules/material-colors/src/androidMain/res/values/light_blue_swatch.xml diff --git a/modules/material-colors/src/main/res/values/light_green_swatch.xml b/modules/material-colors/src/androidMain/res/values/light_green_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/light_green_swatch.xml rename to modules/material-colors/src/androidMain/res/values/light_green_swatch.xml diff --git a/modules/material-colors/src/main/res/values/lime_swatch.xml b/modules/material-colors/src/androidMain/res/values/lime_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/lime_swatch.xml rename to modules/material-colors/src/androidMain/res/values/lime_swatch.xml diff --git a/modules/material-colors/src/main/res/values/orange_swatch.xml b/modules/material-colors/src/androidMain/res/values/orange_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/orange_swatch.xml rename to modules/material-colors/src/androidMain/res/values/orange_swatch.xml diff --git a/modules/material-colors/src/main/res/values/pink_swatch.xml b/modules/material-colors/src/androidMain/res/values/pink_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/pink_swatch.xml rename to modules/material-colors/src/androidMain/res/values/pink_swatch.xml diff --git a/modules/material-colors/src/main/res/values/purple_swatch.xml b/modules/material-colors/src/androidMain/res/values/purple_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/purple_swatch.xml rename to modules/material-colors/src/androidMain/res/values/purple_swatch.xml diff --git a/modules/material-colors/src/main/res/values/red_swatch.xml b/modules/material-colors/src/androidMain/res/values/red_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/red_swatch.xml rename to modules/material-colors/src/androidMain/res/values/red_swatch.xml diff --git a/modules/material-colors/src/main/res/values/teal_swatch.xml b/modules/material-colors/src/androidMain/res/values/teal_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/teal_swatch.xml rename to modules/material-colors/src/androidMain/res/values/teal_swatch.xml diff --git a/modules/material-colors/src/main/res/values/yellow_swatch.xml b/modules/material-colors/src/androidMain/res/values/yellow_swatch.xml similarity index 100% rename from modules/material-colors/src/main/res/values/yellow_swatch.xml rename to modules/material-colors/src/androidMain/res/values/yellow_swatch.xml diff --git a/modules/material-lists/src/main/AndroidManifest.xml b/modules/material-lists/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/material-lists/src/main/AndroidManifest.xml rename to modules/material-lists/src/androidMain/AndroidManifest.xml diff --git a/modules/material-lists/src/main/res/values/view_ids.xml b/modules/material-lists/src/androidMain/res/values/view_ids.xml similarity index 100% rename from modules/material-lists/src/main/res/values/view_ids.xml rename to modules/material-lists/src/androidMain/res/values/view_ids.xml diff --git a/modules/preferences/src/main/AndroidManifest.xml b/modules/preferences/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/preferences/src/main/AndroidManifest.xml rename to modules/preferences/src/androidMain/AndroidManifest.xml diff --git a/modules/resources/src/main/AndroidManifest.xml b/modules/resources/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/resources/src/main/AndroidManifest.xml rename to modules/resources/src/androidMain/AndroidManifest.xml diff --git a/modules/snackbar/src/main/AndroidManifest.xml b/modules/snackbar/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/snackbar/src/main/AndroidManifest.xml rename to modules/snackbar/src/androidMain/AndroidManifest.xml diff --git a/modules/stetho-init/src/main/AndroidManifest.xml b/modules/stetho-init/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/stetho-init/src/main/AndroidManifest.xml rename to modules/stetho-init/src/androidMain/AndroidManifest.xml diff --git a/modules/systemservices/src/main/AndroidManifest.xml b/modules/systemservices/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/systemservices/src/main/AndroidManifest.xml rename to modules/systemservices/src/androidMain/AndroidManifest.xml diff --git a/modules/toast/src/main/AndroidManifest.xml b/modules/toast/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/toast/src/main/AndroidManifest.xml rename to modules/toast/src/androidMain/AndroidManifest.xml diff --git a/modules/typesaferecyclerview/build.gradle.kts b/modules/typesaferecyclerview/build.gradle.kts index 7a90bbe0b..6de6d22a8 100644 --- a/modules/typesaferecyclerview/build.gradle.kts +++ b/modules/typesaferecyclerview/build.gradle.kts @@ -1,17 +1,5 @@ /* - * Copyright (c) 2018. Louis Cognault Ayeva Derman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2019 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license. */ plugins { @@ -23,6 +11,7 @@ plugins { android { setDefaults() + sourceSets.getByName("main").java.srcDir("src/androidMain/java") } kotlin { diff --git a/modules/typesaferecyclerview/src/main/AndroidManifest.xml b/modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/typesaferecyclerview/src/main/AndroidManifest.xml rename to modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml diff --git a/modules/typesaferecyclerview/src/main/java/splitties/typesaferecyclerview/ViewHolder.java b/modules/typesaferecyclerview/src/androidMain/java/splitties/typesaferecyclerview/ViewHolder.java similarity index 100% rename from modules/typesaferecyclerview/src/main/java/splitties/typesaferecyclerview/ViewHolder.java rename to modules/typesaferecyclerview/src/androidMain/java/splitties/typesaferecyclerview/ViewHolder.java diff --git a/modules/views-appcompat/src/main/AndroidManifest.xml b/modules/views-appcompat/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-appcompat/src/main/AndroidManifest.xml rename to modules/views-appcompat/src/androidMain/AndroidManifest.xml diff --git a/modules/views-cardview/src/main/AndroidManifest.xml b/modules/views-cardview/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-cardview/src/main/AndroidManifest.xml rename to modules/views-cardview/src/androidMain/AndroidManifest.xml diff --git a/modules/views-coroutines/src/main/AndroidManifest.xml b/modules/views-coroutines/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-coroutines/src/main/AndroidManifest.xml rename to modules/views-coroutines/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-appcompat/src/main/AndroidManifest.xml b/modules/views-dsl-appcompat/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-appcompat/src/main/AndroidManifest.xml rename to modules/views-dsl-appcompat/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-appcompat/src/main/res/values/attrs.xml b/modules/views-dsl-appcompat/src/androidMain/res/values/attrs.xml similarity index 100% rename from modules/views-dsl-appcompat/src/main/res/values/attrs.xml rename to modules/views-dsl-appcompat/src/androidMain/res/values/attrs.xml diff --git a/modules/views-dsl-appcompat/src/main/res/values/styles.xml b/modules/views-dsl-appcompat/src/androidMain/res/values/styles.xml similarity index 100% rename from modules/views-dsl-appcompat/src/main/res/values/styles.xml rename to modules/views-dsl-appcompat/src/androidMain/res/values/styles.xml diff --git a/modules/views-dsl-constraintlayout/src/main/AndroidManifest.xml b/modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-constraintlayout/src/main/AndroidManifest.xml rename to modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-coordinatorlayout/src/main/AndroidManifest.xml b/modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-coordinatorlayout/src/main/AndroidManifest.xml rename to modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-ide-preview/src/main/AndroidManifest.xml b/modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-ide-preview/src/main/AndroidManifest.xml rename to modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-ide-preview/src/main/res/values/attrs.xml b/modules/views-dsl-ide-preview/src/androidMain/res/values/attrs.xml similarity index 100% rename from modules/views-dsl-ide-preview/src/main/res/values/attrs.xml rename to modules/views-dsl-ide-preview/src/androidMain/res/values/attrs.xml diff --git a/modules/views-dsl-ide-preview/src/main/res/values/parameters.xml b/modules/views-dsl-ide-preview/src/androidMain/res/values/parameters.xml similarity index 100% rename from modules/views-dsl-ide-preview/src/main/res/values/parameters.xml rename to modules/views-dsl-ide-preview/src/androidMain/res/values/parameters.xml diff --git a/modules/views-dsl-material/src/main/AndroidManifest.xml b/modules/views-dsl-material/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-material/src/main/AndroidManifest.xml rename to modules/views-dsl-material/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-material/src/main/res/values/attrs.xml b/modules/views-dsl-material/src/androidMain/res/values/attrs.xml similarity index 100% rename from modules/views-dsl-material/src/main/res/values/attrs.xml rename to modules/views-dsl-material/src/androidMain/res/values/attrs.xml diff --git a/modules/views-dsl-material/src/main/res/values/styles.xml b/modules/views-dsl-material/src/androidMain/res/values/styles.xml similarity index 100% rename from modules/views-dsl-material/src/main/res/values/styles.xml rename to modules/views-dsl-material/src/androidMain/res/values/styles.xml diff --git a/modules/views-dsl-recyclerview/src/main/AndroidManifest.xml b/modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl-recyclerview/src/main/AndroidManifest.xml rename to modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl-recyclerview/src/main/res/layout/recyclerview_with_scrollbars.xml b/modules/views-dsl-recyclerview/src/androidMain/res/layout/recyclerview_with_scrollbars.xml similarity index 100% rename from modules/views-dsl-recyclerview/src/main/res/layout/recyclerview_with_scrollbars.xml rename to modules/views-dsl-recyclerview/src/androidMain/res/layout/recyclerview_with_scrollbars.xml diff --git a/modules/views-dsl-recyclerview/src/main/res/values/styles.xml b/modules/views-dsl-recyclerview/src/androidMain/res/values/styles.xml similarity index 100% rename from modules/views-dsl-recyclerview/src/main/res/values/styles.xml rename to modules/views-dsl-recyclerview/src/androidMain/res/values/styles.xml diff --git a/modules/views-dsl/src/main/AndroidManifest.xml b/modules/views-dsl/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-dsl/src/main/AndroidManifest.xml rename to modules/views-dsl/src/androidMain/AndroidManifest.xml diff --git a/modules/views-material/src/main/AndroidManifest.xml b/modules/views-material/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-material/src/main/AndroidManifest.xml rename to modules/views-material/src/androidMain/AndroidManifest.xml diff --git a/modules/views-recyclerview/src/main/AndroidManifest.xml b/modules/views-recyclerview/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-recyclerview/src/main/AndroidManifest.xml rename to modules/views-recyclerview/src/androidMain/AndroidManifest.xml diff --git a/modules/views-selectable-appcompat/src/main/AndroidManifest.xml b/modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-selectable-appcompat/src/main/AndroidManifest.xml rename to modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml diff --git a/modules/views-selectable-constraintlayout/src/main/AndroidManifest.xml b/modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-selectable-constraintlayout/src/main/AndroidManifest.xml rename to modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml diff --git a/modules/views-selectable/src/main/AndroidManifest.xml b/modules/views-selectable/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views-selectable/src/main/AndroidManifest.xml rename to modules/views-selectable/src/androidMain/AndroidManifest.xml diff --git a/modules/views/src/main/AndroidManifest.xml b/modules/views/src/androidMain/AndroidManifest.xml similarity index 100% rename from modules/views/src/main/AndroidManifest.xml rename to modules/views/src/androidMain/AndroidManifest.xml diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/androidMain/AndroidManifest.xml similarity index 100% rename from sample/src/main/AndroidManifest.xml rename to sample/src/androidMain/AndroidManifest.xml diff --git a/sample/src/androidMain/kotlin/com/louiscad/splittiessample/preview/permissions/PermissionsExampleActivity.kt b/sample/src/androidMain/kotlin/com/louiscad/splittiessample/preview/permissions/PermissionsExampleActivity.kt index 14ba1c472..d570837d0 100644 --- a/sample/src/androidMain/kotlin/com/louiscad/splittiessample/preview/permissions/PermissionsExampleActivity.kt +++ b/sample/src/androidMain/kotlin/com/louiscad/splittiessample/preview/permissions/PermissionsExampleActivity.kt @@ -26,7 +26,12 @@ import splitties.lifecycle.coroutines.PotentialFutureAndroidXLifecycleKtxApi import splitties.lifecycle.coroutines.awaitState import splitties.lifecycle.coroutines.coroutineScope import splitties.views.centerText -import splitties.views.dsl.core.* +import splitties.views.dsl.core.add +import splitties.views.dsl.core.contentView +import splitties.views.dsl.core.frameLayout +import splitties.views.dsl.core.lParams +import splitties.views.dsl.core.margin +import splitties.views.dsl.core.textView import splitties.views.gravityCenter import splitties.views.textAppearance diff --git a/sample/src/main/res/drawable/ic_bug_report_white_24dp.xml b/sample/src/androidMain/res/drawable/ic_bug_report_white_24dp.xml similarity index 100% rename from sample/src/main/res/drawable/ic_bug_report_white_24dp.xml rename to sample/src/androidMain/res/drawable/ic_bug_report_white_24dp.xml diff --git a/sample/src/main/res/drawable/ic_computer_white_24dp.xml b/sample/src/androidMain/res/drawable/ic_computer_white_24dp.xml similarity index 100% rename from sample/src/main/res/drawable/ic_computer_white_24dp.xml rename to sample/src/androidMain/res/drawable/ic_computer_white_24dp.xml diff --git a/sample/src/main/res/drawable/ic_favorite_white_24dp.xml b/sample/src/androidMain/res/drawable/ic_favorite_white_24dp.xml similarity index 100% rename from sample/src/main/res/drawable/ic_favorite_white_24dp.xml rename to sample/src/androidMain/res/drawable/ic_favorite_white_24dp.xml diff --git a/sample/src/main/res/drawable/ic_invert_colors_white_24dp.xml b/sample/src/androidMain/res/drawable/ic_invert_colors_white_24dp.xml similarity index 100% rename from sample/src/main/res/drawable/ic_invert_colors_white_24dp.xml rename to sample/src/androidMain/res/drawable/ic_invert_colors_white_24dp.xml diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/androidMain/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/mipmap-hdpi/ic_launcher.png rename to sample/src/androidMain/res/mipmap-hdpi/ic_launcher.png diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/sample/src/androidMain/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/mipmap-mdpi/ic_launcher.png rename to sample/src/androidMain/res/mipmap-mdpi/ic_launcher.png diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/androidMain/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/mipmap-xhdpi/ic_launcher.png rename to sample/src/androidMain/res/mipmap-xhdpi/ic_launcher.png diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to sample/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to sample/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/sample/src/main/res/values-night/styles.xml b/sample/src/androidMain/res/values-night/styles.xml similarity index 100% rename from sample/src/main/res/values-night/styles.xml rename to sample/src/androidMain/res/values-night/styles.xml diff --git a/sample/src/main/res/values-w820dp/dimens.xml b/sample/src/androidMain/res/values-w820dp/dimens.xml similarity index 100% rename from sample/src/main/res/values-w820dp/dimens.xml rename to sample/src/androidMain/res/values-w820dp/dimens.xml diff --git a/sample/src/main/res/values/colors.xml b/sample/src/androidMain/res/values/colors.xml similarity index 100% rename from sample/src/main/res/values/colors.xml rename to sample/src/androidMain/res/values/colors.xml diff --git a/sample/src/main/res/values/dimens.xml b/sample/src/androidMain/res/values/dimens.xml similarity index 100% rename from sample/src/main/res/values/dimens.xml rename to sample/src/androidMain/res/values/dimens.xml diff --git a/sample/src/main/res/values/menu_ids.xml b/sample/src/androidMain/res/values/menu_ids.xml similarity index 100% rename from sample/src/main/res/values/menu_ids.xml rename to sample/src/androidMain/res/values/menu_ids.xml diff --git a/sample/src/main/res/values/strings.xml b/sample/src/androidMain/res/values/strings.xml similarity index 100% rename from sample/src/main/res/values/strings.xml rename to sample/src/androidMain/res/values/strings.xml diff --git a/sample/src/main/res/values/styles.xml b/sample/src/androidMain/res/values/styles.xml similarity index 100% rename from sample/src/main/res/values/styles.xml rename to sample/src/androidMain/res/values/styles.xml diff --git a/sample/src/main/res/values/view_ids.xml b/sample/src/androidMain/res/values/view_ids.xml similarity index 100% rename from sample/src/main/res/values/view_ids.xml rename to sample/src/androidMain/res/values/view_ids.xml