From 07bd092d7650406c8501c1f434595ec2cfb9854d Mon Sep 17 00:00:00 2001 From: Taso Dane Date: Tue, 10 Nov 2020 23:27:52 +0100 Subject: [PATCH 1/5] Add Auto-Manifest plugin Auto-Manifest automatically generates AndroidManifest packageName based on Gradle module structure. Since Splitties has `modules` and `fun-packs` separated, it would put `modules` in the middle of the package. That's why the plugin is applied under `modules/build.gradle.kts`. This made me realize a small issue on the plugin and released a fix. Once change required in the code was that `views-dsl` used `views.dsl.core` as packageName and I had to change the imports. Since these imports are not exposed, I don't think it is a breaking change. --- build.gradle.kts | 1 + .../src/main/kotlin/config/AndroidLibraryConfig.kt | 9 +++++---- .../build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- fun-packs/android-appcompat/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- .../android-base-with-views-dsl/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- fun-packs/android-base/build.gradle.kts | 2 +- .../android-base/src/androidMain/AndroidManifest.xml | 4 ---- .../build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- .../android-material-components/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- fun-packs/build.gradle.kts | 12 ++++++++++++ modules/activities/build.gradle.kts | 2 +- .../activities/src/androidMain/AndroidManifest.xml | 4 ---- .../build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 6 ------ modules/alertdialog-appcompat/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 6 ------ modules/alertdialog-material/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 6 ------ modules/alertdialog/build.gradle.kts | 2 +- .../alertdialog/src/androidMain/AndroidManifest.xml | 6 ------ modules/appctx/build.gradle.kts | 2 +- modules/arch-lifecycle/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/arch-room/build.gradle.kts | 2 +- .../arch-room/src/androidMain/AndroidManifest.xml | 5 ----- modules/build.gradle.kts | 12 ++++++++++++ modules/bundle/build.gradle.kts | 2 +- modules/bundle/src/androidMain/AndroidManifest.xml | 5 ----- modules/checkedlazy/build.gradle.kts | 2 +- .../checkedlazy/src/androidMain/AndroidManifest.xml | 9 --------- modules/dimensions/build.gradle.kts | 2 +- .../dimensions/src/androidMain/AndroidManifest.xml | 6 ------ modules/exceptions/build.gradle.kts | 2 +- .../exceptions/src/androidMain/AndroidManifest.xml | 5 ----- modules/fragmentargs/build.gradle.kts | 2 +- .../fragmentargs/src/androidMain/AndroidManifest.xml | 5 ----- modules/fragments/build.gradle.kts | 2 +- .../fragments/src/androidMain/AndroidManifest.xml | 4 ---- modules/initprovider/build.gradle.kts | 2 +- .../initprovider/src/androidMain/AndroidManifest.xml | 5 ----- modules/intents/build.gradle.kts | 2 +- modules/intents/src/androidMain/AndroidManifest.xml | 4 ---- modules/lifecycle-coroutines/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/mainhandler/build.gradle.kts | 2 +- .../mainhandler/src/androidMain/AndroidManifest.xml | 5 ----- modules/mainthread/build.gradle.kts | 2 +- .../mainthread/src/androidMain/AndroidManifest.xml | 5 ----- modules/material-colors/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- modules/material-lists/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/permissions/build.gradle.kts | 2 +- modules/preferences/build.gradle.kts | 2 +- .../preferences/src/androidMain/AndroidManifest.xml | 9 --------- modules/resources/build.gradle.kts | 2 +- .../resources/src/androidMain/AndroidManifest.xml | 5 ----- modules/snackbar/build.gradle.kts | 2 +- modules/snackbar/src/androidMain/AndroidManifest.xml | 5 ----- modules/stetho-init/build.gradle.kts | 2 +- modules/systemservices/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/toast/build.gradle.kts | 2 +- modules/toast/src/androidMain/AndroidManifest.xml | 5 ----- modules/typesaferecyclerview/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 9 --------- modules/views-appcompat/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-cardview/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- modules/views-coroutines-material/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 6 ------ modules/views-coroutines/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-dsl-appcompat/build.gradle.kts | 2 +- modules/views-dsl-constraintlayout/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-dsl-coordinatorlayout/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-dsl-ide-preview/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-dsl-material/build.gradle.kts | 2 +- modules/views-dsl-recyclerview/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- modules/views-dsl/build.gradle.kts | 2 +- .../views-dsl/src/androidMain/AndroidManifest.xml | 5 ----- .../kotlin/splitties/views/dsl/Preview.kt | 1 - .../splitties/views/dsl/idepreview/UiPreView.kt | 2 +- modules/views-material/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- modules/views-recyclerview/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 4 ---- modules/views-selectable-appcompat/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- .../build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views-selectable/build.gradle.kts | 2 +- .../src/androidMain/AndroidManifest.xml | 5 ----- modules/views/build.gradle.kts | 2 +- modules/views/src/androidMain/AndroidManifest.xml | 5 ----- test-helpers/build.gradle.kts | 2 +- 106 files changed, 84 insertions(+), 298 deletions(-) delete mode 100644 fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml delete mode 100644 fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml delete mode 100644 fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml delete mode 100644 fun-packs/android-base/src/androidMain/AndroidManifest.xml delete mode 100644 fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml delete mode 100644 fun-packs/android-material-components/src/androidMain/AndroidManifest.xml create mode 100644 fun-packs/build.gradle.kts delete mode 100644 modules/activities/src/androidMain/AndroidManifest.xml delete mode 100644 modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml delete mode 100644 modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml delete mode 100644 modules/alertdialog-material/src/androidMain/AndroidManifest.xml delete mode 100644 modules/alertdialog/src/androidMain/AndroidManifest.xml delete mode 100644 modules/arch-lifecycle/src/androidMain/AndroidManifest.xml delete mode 100644 modules/arch-room/src/androidMain/AndroidManifest.xml create mode 100644 modules/build.gradle.kts delete mode 100644 modules/bundle/src/androidMain/AndroidManifest.xml delete mode 100644 modules/checkedlazy/src/androidMain/AndroidManifest.xml delete mode 100644 modules/dimensions/src/androidMain/AndroidManifest.xml delete mode 100644 modules/exceptions/src/androidMain/AndroidManifest.xml delete mode 100644 modules/fragmentargs/src/androidMain/AndroidManifest.xml delete mode 100644 modules/fragments/src/androidMain/AndroidManifest.xml delete mode 100644 modules/initprovider/src/androidMain/AndroidManifest.xml delete mode 100644 modules/intents/src/androidMain/AndroidManifest.xml delete mode 100644 modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml delete mode 100644 modules/mainhandler/src/androidMain/AndroidManifest.xml delete mode 100644 modules/mainthread/src/androidMain/AndroidManifest.xml delete mode 100644 modules/material-colors/src/androidMain/AndroidManifest.xml delete mode 100644 modules/material-lists/src/androidMain/AndroidManifest.xml delete mode 100644 modules/preferences/src/androidMain/AndroidManifest.xml delete mode 100644 modules/resources/src/androidMain/AndroidManifest.xml delete mode 100644 modules/snackbar/src/androidMain/AndroidManifest.xml delete mode 100644 modules/systemservices/src/androidMain/AndroidManifest.xml delete mode 100644 modules/toast/src/androidMain/AndroidManifest.xml delete mode 100644 modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-appcompat/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-cardview/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-coroutines-material/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-coroutines/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-dsl/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-material/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-recyclerview/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views-selectable/src/androidMain/AndroidManifest.xml delete mode 100644 modules/views/src/androidMain/AndroidManifest.xml diff --git a/build.gradle.kts b/build.gradle.kts index d053dbbfe..88aff3379 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,7 @@ buildscript { plugins { id("com.osacky.doctor") + id("com.gradleup.auto.manifest") version "1.0.3" apply false } // Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt index dde22dc1f..336b727a7 100644 --- a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt +++ b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt @@ -4,9 +4,10 @@ @file:Suppress("PackageDirectoryMismatch") +import org.gradle.api.Project import com.android.build.gradle.LibraryExtension as AndroidLibraryExtension -fun AndroidLibraryExtension.setDefaults(generateBuildConfig: Boolean = false) { +fun AndroidLibraryExtension.setDefaults(project: Project, generateBuildConfig: Boolean = false) { compileSdkVersion(ProjectVersions.androidSdk) buildToolsVersion(ProjectVersions.androidBuildTools) defaultConfig { @@ -24,15 +25,15 @@ fun AndroidLibraryExtension.setDefaults(generateBuildConfig: Boolean = false) { this.buildConfig = generateBuildConfig } sourceSets.getByName("main") { - manifest.srcFile("src/androidMain/AndroidManifest.xml") + if (project.file("src/androidMain/AndroidManifest.xml").exists()) { + manifest.srcFile("src/androidMain/AndroidManifest.xml") + } res.srcDir("src/androidMain/res") } sourceSets.getByName("debug") { - manifest.srcFile("src/androidDebug/AndroidManifest.xml") res.srcDir("src/androidDebug/res") } sourceSets.getByName("release") { - manifest.srcFile("src/androidRelease/AndroidManifest.xml") res.srcDir("src/androidRelease/res") } sourceSets.getByName("androidTest") { diff --git a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts index b8ad7db0c..ac588aa81 100644 --- a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 6212e3908..000000000 --- a/fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/android-appcompat/build.gradle.kts b/fun-packs/android-appcompat/build.gradle.kts index dd45ddc50..ed46940db 100644 --- a/fun-packs/android-appcompat/build.gradle.kts +++ b/fun-packs/android-appcompat/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml b/fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 4aae14905..000000000 --- a/fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/android-base-with-views-dsl/build.gradle.kts b/fun-packs/android-base-with-views-dsl/build.gradle.kts index eb7efa92d..7c0e6e26b 100644 --- a/fun-packs/android-base-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-base-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 8902f6dab..000000000 --- a/fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/android-base/build.gradle.kts b/fun-packs/android-base/build.gradle.kts index 7fa38d8b6..83989f712 100644 --- a/fun-packs/android-base/build.gradle.kts +++ b/fun-packs/android-base/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-base/src/androidMain/AndroidManifest.xml b/fun-packs/android-base/src/androidMain/AndroidManifest.xml deleted file mode 100644 index d6c011604..000000000 --- a/fun-packs/android-base/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts index d0e508fda..4d2ea22db 100644 --- a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml deleted file mode 100644 index f10f587f5..000000000 --- a/fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/android-material-components/build.gradle.kts b/fun-packs/android-material-components/build.gradle.kts index 10ffafff0..b6b90c8f3 100644 --- a/fun-packs/android-material-components/build.gradle.kts +++ b/fun-packs/android-material-components/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/fun-packs/android-material-components/src/androidMain/AndroidManifest.xml b/fun-packs/android-material-components/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 4040a3655..000000000 --- a/fun-packs/android-material-components/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/fun-packs/build.gradle.kts b/fun-packs/build.gradle.kts new file mode 100644 index 000000000..eaffa5aef --- /dev/null +++ b/fun-packs/build.gradle.kts @@ -0,0 +1,12 @@ +/* + * Copyright 2020 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license. + */ + +plugins { + id("com.gradleup.auto.manifest") +} + +autoManifest { + packageName.set("splitties.fun.pack") + replaceDashesWithDot.set(true) +} diff --git a/modules/activities/build.gradle.kts b/modules/activities/build.gradle.kts index bfe420291..8668d9883 100644 --- a/modules/activities/build.gradle.kts +++ b/modules/activities/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/activities/src/androidMain/AndroidManifest.xml b/modules/activities/src/androidMain/AndroidManifest.xml deleted file mode 100644 index dc3d9f84c..000000000 --- a/modules/activities/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/alertdialog-appcompat-coroutines/build.gradle.kts b/modules/alertdialog-appcompat-coroutines/build.gradle.kts index 3b2aa317b..e8775e608 100644 --- a/modules/alertdialog-appcompat-coroutines/build.gradle.kts +++ b/modules/alertdialog-appcompat-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml b/modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml deleted file mode 100644 index d00af9a10..000000000 --- a/modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/modules/alertdialog-appcompat/build.gradle.kts b/modules/alertdialog-appcompat/build.gradle.kts index dd4f14c33..e4a3ee07c 100644 --- a/modules/alertdialog-appcompat/build.gradle.kts +++ b/modules/alertdialog-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml b/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 873600fe2..000000000 --- a/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/modules/alertdialog-material/build.gradle.kts b/modules/alertdialog-material/build.gradle.kts index a58d82034..1e64808cd 100644 --- a/modules/alertdialog-material/build.gradle.kts +++ b/modules/alertdialog-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/alertdialog-material/src/androidMain/AndroidManifest.xml b/modules/alertdialog-material/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 6722840fb..000000000 --- a/modules/alertdialog-material/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/modules/alertdialog/build.gradle.kts b/modules/alertdialog/build.gradle.kts index 18dc82ec9..2030fe000 100644 --- a/modules/alertdialog/build.gradle.kts +++ b/modules/alertdialog/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/alertdialog/src/androidMain/AndroidManifest.xml b/modules/alertdialog/src/androidMain/AndroidManifest.xml deleted file mode 100644 index b29bf34cf..000000000 --- a/modules/alertdialog/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/modules/appctx/build.gradle.kts b/modules/appctx/build.gradle.kts index 623c3b4b9..526b6ec6e 100644 --- a/modules/appctx/build.gradle.kts +++ b/modules/appctx/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/arch-lifecycle/build.gradle.kts b/modules/arch-lifecycle/build.gradle.kts index 43b182f2f..8e81a5134 100644 --- a/modules/arch-lifecycle/build.gradle.kts +++ b/modules/arch-lifecycle/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml b/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml deleted file mode 100644 index e1a89a077..000000000 --- a/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/arch-room/build.gradle.kts b/modules/arch-room/build.gradle.kts index f2f17f720..69208eb9e 100644 --- a/modules/arch-room/build.gradle.kts +++ b/modules/arch-room/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/arch-room/src/androidMain/AndroidManifest.xml b/modules/arch-room/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 008b66966..000000000 --- a/modules/arch-room/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/build.gradle.kts b/modules/build.gradle.kts new file mode 100644 index 000000000..556b4f14a --- /dev/null +++ b/modules/build.gradle.kts @@ -0,0 +1,12 @@ +/* + * Copyright 2020 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license. + */ + +plugins { + id("com.gradleup.auto.manifest") +} + +autoManifest { + packageName.set("splitties") + replaceDashesWithDot.set(true) +} diff --git a/modules/bundle/build.gradle.kts b/modules/bundle/build.gradle.kts index 6d1c75935..0db422d87 100644 --- a/modules/bundle/build.gradle.kts +++ b/modules/bundle/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/bundle/src/androidMain/AndroidManifest.xml b/modules/bundle/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 392b89445..000000000 --- a/modules/bundle/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/checkedlazy/build.gradle.kts b/modules/checkedlazy/build.gradle.kts index 4072ec37a..1d88f631a 100644 --- a/modules/checkedlazy/build.gradle.kts +++ b/modules/checkedlazy/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/checkedlazy/src/androidMain/AndroidManifest.xml b/modules/checkedlazy/src/androidMain/AndroidManifest.xml deleted file mode 100644 index be073ac2d..000000000 --- a/modules/checkedlazy/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/modules/dimensions/build.gradle.kts b/modules/dimensions/build.gradle.kts index bfe420291..8668d9883 100644 --- a/modules/dimensions/build.gradle.kts +++ b/modules/dimensions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/dimensions/src/androidMain/AndroidManifest.xml b/modules/dimensions/src/androidMain/AndroidManifest.xml deleted file mode 100644 index bbc94f46b..000000000 --- a/modules/dimensions/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/modules/exceptions/build.gradle.kts b/modules/exceptions/build.gradle.kts index bfe420291..8668d9883 100644 --- a/modules/exceptions/build.gradle.kts +++ b/modules/exceptions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/exceptions/src/androidMain/AndroidManifest.xml b/modules/exceptions/src/androidMain/AndroidManifest.xml deleted file mode 100644 index a5d0c4439..000000000 --- a/modules/exceptions/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/fragmentargs/build.gradle.kts b/modules/fragmentargs/build.gradle.kts index ef4bf77a9..fca237407 100644 --- a/modules/fragmentargs/build.gradle.kts +++ b/modules/fragmentargs/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/fragmentargs/src/androidMain/AndroidManifest.xml b/modules/fragmentargs/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 624d87eb9..000000000 --- a/modules/fragmentargs/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/fragments/build.gradle.kts b/modules/fragments/build.gradle.kts index d4c8417d7..b169364cd 100644 --- a/modules/fragments/build.gradle.kts +++ b/modules/fragments/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/fragments/src/androidMain/AndroidManifest.xml b/modules/fragments/src/androidMain/AndroidManifest.xml deleted file mode 100644 index f7682cf33..000000000 --- a/modules/fragments/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/initprovider/build.gradle.kts b/modules/initprovider/build.gradle.kts index cf4251175..258df2ff5 100644 --- a/modules/initprovider/build.gradle.kts +++ b/modules/initprovider/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/initprovider/src/androidMain/AndroidManifest.xml b/modules/initprovider/src/androidMain/AndroidManifest.xml deleted file mode 100644 index bbe86abd1..000000000 --- a/modules/initprovider/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/intents/build.gradle.kts b/modules/intents/build.gradle.kts index 1de38df9e..977d3ccf9 100644 --- a/modules/intents/build.gradle.kts +++ b/modules/intents/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/intents/src/androidMain/AndroidManifest.xml b/modules/intents/src/androidMain/AndroidManifest.xml deleted file mode 100644 index ed0de7e4d..000000000 --- a/modules/intents/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/lifecycle-coroutines/build.gradle.kts b/modules/lifecycle-coroutines/build.gradle.kts index 2cf13f0d9..5c4332d45 100644 --- a/modules/lifecycle-coroutines/build.gradle.kts +++ b/modules/lifecycle-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml b/modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 8163aa5f0..000000000 --- a/modules/lifecycle-coroutines/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/mainhandler/build.gradle.kts b/modules/mainhandler/build.gradle.kts index d14acb864..58b7545bd 100644 --- a/modules/mainhandler/build.gradle.kts +++ b/modules/mainhandler/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/mainhandler/src/androidMain/AndroidManifest.xml b/modules/mainhandler/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 84fbc2013..000000000 --- a/modules/mainhandler/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/mainthread/build.gradle.kts b/modules/mainthread/build.gradle.kts index 047ecb6ef..3ecef8cb1 100644 --- a/modules/mainthread/build.gradle.kts +++ b/modules/mainthread/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/mainthread/src/androidMain/AndroidManifest.xml b/modules/mainthread/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 986d31395..000000000 --- a/modules/mainthread/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/material-colors/build.gradle.kts b/modules/material-colors/build.gradle.kts index bfe420291..8668d9883 100644 --- a/modules/material-colors/build.gradle.kts +++ b/modules/material-colors/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/material-colors/src/androidMain/AndroidManifest.xml b/modules/material-colors/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 032346d27..000000000 --- a/modules/material-colors/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/material-lists/build.gradle.kts b/modules/material-lists/build.gradle.kts index 3c5a60b2d..94a17df88 100644 --- a/modules/material-lists/build.gradle.kts +++ b/modules/material-lists/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/material-lists/src/androidMain/AndroidManifest.xml b/modules/material-lists/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 4cce428d8..000000000 --- a/modules/material-lists/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/permissions/build.gradle.kts b/modules/permissions/build.gradle.kts index 6599b2d3a..5dba1df5d 100644 --- a/modules/permissions/build.gradle.kts +++ b/modules/permissions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/preferences/build.gradle.kts b/modules/preferences/build.gradle.kts index dd47adece..11ec6eff7 100644 --- a/modules/preferences/build.gradle.kts +++ b/modules/preferences/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/preferences/src/androidMain/AndroidManifest.xml b/modules/preferences/src/androidMain/AndroidManifest.xml deleted file mode 100644 index d616b1f14..000000000 --- a/modules/preferences/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/modules/resources/build.gradle.kts b/modules/resources/build.gradle.kts index 4b4331415..7d917d1b1 100644 --- a/modules/resources/build.gradle.kts +++ b/modules/resources/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/resources/src/androidMain/AndroidManifest.xml b/modules/resources/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 83c8ff0dc..000000000 --- a/modules/resources/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/snackbar/build.gradle.kts b/modules/snackbar/build.gradle.kts index a9568a1d5..f707f99c0 100644 --- a/modules/snackbar/build.gradle.kts +++ b/modules/snackbar/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/snackbar/src/androidMain/AndroidManifest.xml b/modules/snackbar/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 557f10313..000000000 --- a/modules/snackbar/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/stetho-init/build.gradle.kts b/modules/stetho-init/build.gradle.kts index 6b097c496..0e9d695e8 100644 --- a/modules/stetho-init/build.gradle.kts +++ b/modules/stetho-init/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/systemservices/build.gradle.kts b/modules/systemservices/build.gradle.kts index eb7e9d7ae..d9afb1f27 100644 --- a/modules/systemservices/build.gradle.kts +++ b/modules/systemservices/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/systemservices/src/androidMain/AndroidManifest.xml b/modules/systemservices/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 5b3fc33ac..000000000 --- a/modules/systemservices/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/toast/build.gradle.kts b/modules/toast/build.gradle.kts index 8c5f559dc..530bc1edb 100644 --- a/modules/toast/build.gradle.kts +++ b/modules/toast/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/toast/src/androidMain/AndroidManifest.xml b/modules/toast/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 5dd519dab..000000000 --- a/modules/toast/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/typesaferecyclerview/build.gradle.kts b/modules/typesaferecyclerview/build.gradle.kts index 3c9727a8d..d10ade440 100644 --- a/modules/typesaferecyclerview/build.gradle.kts +++ b/modules/typesaferecyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) sourceSets.getByName("main").java.srcDir("src/androidMain/java") } diff --git a/modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml b/modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 93c3393ce..000000000 --- a/modules/typesaferecyclerview/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/modules/views-appcompat/build.gradle.kts b/modules/views-appcompat/build.gradle.kts index 7ce010934..5e3c0443f 100644 --- a/modules/views-appcompat/build.gradle.kts +++ b/modules/views-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-appcompat/src/androidMain/AndroidManifest.xml b/modules/views-appcompat/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 04f4411f9..000000000 --- a/modules/views-appcompat/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-cardview/build.gradle.kts b/modules/views-cardview/build.gradle.kts index 0ef694aa2..f0415f094 100644 --- a/modules/views-cardview/build.gradle.kts +++ b/modules/views-cardview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-cardview/src/androidMain/AndroidManifest.xml b/modules/views-cardview/src/androidMain/AndroidManifest.xml deleted file mode 100644 index ec03b3a70..000000000 --- a/modules/views-cardview/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/views-coroutines-material/build.gradle.kts b/modules/views-coroutines-material/build.gradle.kts index 369859c58..060615723 100644 --- a/modules/views-coroutines-material/build.gradle.kts +++ b/modules/views-coroutines-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-coroutines-material/src/androidMain/AndroidManifest.xml b/modules/views-coroutines-material/src/androidMain/AndroidManifest.xml deleted file mode 100644 index ea7e09b43..000000000 --- a/modules/views-coroutines-material/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/modules/views-coroutines/build.gradle.kts b/modules/views-coroutines/build.gradle.kts index c2d5e258a..d6a5c3f17 100644 --- a/modules/views-coroutines/build.gradle.kts +++ b/modules/views-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-coroutines/src/androidMain/AndroidManifest.xml b/modules/views-coroutines/src/androidMain/AndroidManifest.xml deleted file mode 100644 index f3dff0ecb..000000000 --- a/modules/views-coroutines/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-dsl-appcompat/build.gradle.kts b/modules/views-dsl-appcompat/build.gradle.kts index e4f18d2b4..cb6687ac7 100644 --- a/modules/views-dsl-appcompat/build.gradle.kts +++ b/modules/views-dsl-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-constraintlayout/build.gradle.kts b/modules/views-dsl-constraintlayout/build.gradle.kts index c1f55e224..f5bcf7c79 100644 --- a/modules/views-dsl-constraintlayout/build.gradle.kts +++ b/modules/views-dsl-constraintlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml b/modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 498ddad3f..000000000 --- a/modules/views-dsl-constraintlayout/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-dsl-coordinatorlayout/build.gradle.kts b/modules/views-dsl-coordinatorlayout/build.gradle.kts index 88aa7d4be..a734730a8 100644 --- a/modules/views-dsl-coordinatorlayout/build.gradle.kts +++ b/modules/views-dsl-coordinatorlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml b/modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 1934e0dbc..000000000 --- a/modules/views-dsl-coordinatorlayout/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-dsl-ide-preview/build.gradle.kts b/modules/views-dsl-ide-preview/build.gradle.kts index 6f9068203..5b6986234 100644 --- a/modules/views-dsl-ide-preview/build.gradle.kts +++ b/modules/views-dsl-ide-preview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml b/modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 88ba62eb2..000000000 --- a/modules/views-dsl-ide-preview/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-dsl-material/build.gradle.kts b/modules/views-dsl-material/build.gradle.kts index 00f49f139..a75ac9594 100644 --- a/modules/views-dsl-material/build.gradle.kts +++ b/modules/views-dsl-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-recyclerview/build.gradle.kts b/modules/views-dsl-recyclerview/build.gradle.kts index a16f0cd61..fec522ca9 100644 --- a/modules/views-dsl-recyclerview/build.gradle.kts +++ b/modules/views-dsl-recyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml b/modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml deleted file mode 100644 index d1db7edb7..000000000 --- a/modules/views-dsl-recyclerview/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/views-dsl/build.gradle.kts b/modules/views-dsl/build.gradle.kts index 5a08a782f..75aa7f209 100644 --- a/modules/views-dsl/build.gradle.kts +++ b/modules/views-dsl/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(generateBuildConfig = true) + setDefaults(project, generateBuildConfig = true) } kotlin { diff --git a/modules/views-dsl/src/androidMain/AndroidManifest.xml b/modules/views-dsl/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 76c66d405..000000000 --- a/modules/views-dsl/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt index 222a73576..905670797 100644 --- a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt +++ b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt @@ -5,7 +5,6 @@ package splitties.views.dsl import android.view.View -import splitties.views.dsl.core.BuildConfig import splitties.views.dsl.core.Ui val View.isInPreview: Boolean diff --git a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt index 08edcb5cb..7c8257ca9 100644 --- a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt +++ b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt @@ -30,7 +30,7 @@ import kotlin.contracts.InvocationKind import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext -import splitties.views.dsl.core.R +import splitties.views.dsl.R /** * This class is dedicated to previewing `Ui` subclasses in the IDE. diff --git a/modules/views-material/build.gradle.kts b/modules/views-material/build.gradle.kts index 4868a6d2c..2f0be32ad 100644 --- a/modules/views-material/build.gradle.kts +++ b/modules/views-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-material/src/androidMain/AndroidManifest.xml b/modules/views-material/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 8d67b2027..000000000 --- a/modules/views-material/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/views-recyclerview/build.gradle.kts b/modules/views-recyclerview/build.gradle.kts index f09a18676..4ab039c8a 100644 --- a/modules/views-recyclerview/build.gradle.kts +++ b/modules/views-recyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-recyclerview/src/androidMain/AndroidManifest.xml b/modules/views-recyclerview/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 449cb2b6b..000000000 --- a/modules/views-recyclerview/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/modules/views-selectable-appcompat/build.gradle.kts b/modules/views-selectable-appcompat/build.gradle.kts index f2000a172..141072803 100644 --- a/modules/views-selectable-appcompat/build.gradle.kts +++ b/modules/views-selectable-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml b/modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 67a16969f..000000000 --- a/modules/views-selectable-appcompat/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-selectable-constraintlayout/build.gradle.kts b/modules/views-selectable-constraintlayout/build.gradle.kts index 59fe8ced9..b5e4dc74d 100644 --- a/modules/views-selectable-constraintlayout/build.gradle.kts +++ b/modules/views-selectable-constraintlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml b/modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml deleted file mode 100644 index f04491761..000000000 --- a/modules/views-selectable-constraintlayout/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views-selectable/build.gradle.kts b/modules/views-selectable/build.gradle.kts index 251718cac..e09316282 100644 --- a/modules/views-selectable/build.gradle.kts +++ b/modules/views-selectable/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views-selectable/src/androidMain/AndroidManifest.xml b/modules/views-selectable/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 14740308a..000000000 --- a/modules/views-selectable/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/modules/views/build.gradle.kts b/modules/views/build.gradle.kts index 475436b4c..9d19a1ae3 100644 --- a/modules/views/build.gradle.kts +++ b/modules/views/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { diff --git a/modules/views/src/androidMain/AndroidManifest.xml b/modules/views/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 8720ab274..000000000 --- a/modules/views/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/test-helpers/build.gradle.kts b/test-helpers/build.gradle.kts index 25e46a20b..43a77cd81 100644 --- a/test-helpers/build.gradle.kts +++ b/test-helpers/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults() + setDefaults(project) } kotlin { From e58d8d94ea015be03ca34be46ec3063517184452 Mon Sep 17 00:00:00 2001 From: Taso Dane Date: Wed, 11 Nov 2020 21:46:26 +0100 Subject: [PATCH 2/5] Move the version to versions.gradle --- build.gradle.kts | 2 +- versions.properties | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 88aff3379..25e20662b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ buildscript { plugins { id("com.osacky.doctor") - id("com.gradleup.auto.manifest") version "1.0.3" apply false + id("com.gradleup.auto.manifest") apply false } // Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/versions.properties b/versions.properties index 4185c5ff5..2714235db 100644 --- a/versions.properties +++ b/versions.properties @@ -5,7 +5,7 @@ ## Generated by $ ./gradlew refreshVersions ## Please, don't put extra comments in that file yet, keeping them is not supported yet. -plugin.android=4.1.0-rc02 +plugin.android=4.1.0 ## # available=4.2.0-alpha01 ## # available=4.2.0-alpha02 ## # available=4.2.0-alpha03 @@ -19,6 +19,8 @@ plugin.android=4.1.0-rc02 plugin.com.osacky.doctor=0.5.1 +plugin.com.gradleup.auto.manifest=1.0.3 + version.androidx.annotation=1.1.0 ## # available=1.2.0-alpha01 From 2d178b51781a2130c6b90deb6f2cd0ae693dd37e Mon Sep 17 00:00:00 2001 From: Taso Dane Date: Fri, 13 Nov 2020 18:58:00 +0100 Subject: [PATCH 3/5] Small fixes after code review --- build.gradle.kts | 1 - buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt | 7 +++++-- versions.properties | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 25e20662b..d053dbbfe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,6 @@ buildscript { plugins { id("com.osacky.doctor") - id("com.gradleup.auto.manifest") apply false } // Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt index 336b727a7..5751c6c84 100644 --- a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt +++ b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt @@ -25,15 +25,18 @@ fun AndroidLibraryExtension.setDefaults(project: Project, generateBuildConfig: B this.buildConfig = generateBuildConfig } sourceSets.getByName("main") { - if (project.file("src/androidMain/AndroidManifest.xml").exists()) { - manifest.srcFile("src/androidMain/AndroidManifest.xml") + val srcDir = manifest.srcFile.parentFile.parentFile + srcDir.resolve("androidMain/AndroidManifest.xml").let { + if (it.exists()) manifest.srcFile(it) } res.srcDir("src/androidMain/res") } sourceSets.getByName("debug") { + manifest.srcFile("src/androidDebug/AndroidManifest.xml") res.srcDir("src/androidDebug/res") } sourceSets.getByName("release") { + manifest.srcFile("src/androidRelease/AndroidManifest.xml") res.srcDir("src/androidRelease/res") } sourceSets.getByName("androidTest") { diff --git a/versions.properties b/versions.properties index 2714235db..27c1456a3 100644 --- a/versions.properties +++ b/versions.properties @@ -5,7 +5,7 @@ ## Generated by $ ./gradlew refreshVersions ## Please, don't put extra comments in that file yet, keeping them is not supported yet. -plugin.android=4.1.0 +plugin.android=4.1.1 ## # available=4.2.0-alpha01 ## # available=4.2.0-alpha02 ## # available=4.2.0-alpha03 @@ -17,10 +17,10 @@ plugin.android=4.1.0 ## # available=4.2.0-alpha09 ## # available=4.2.0-alpha10 -plugin.com.osacky.doctor=0.5.1 - plugin.com.gradleup.auto.manifest=1.0.3 +plugin.com.osacky.doctor=0.5.1 + version.androidx.annotation=1.1.0 ## # available=1.2.0-alpha01 From 99bb27e83fe03f6d6d72137d9e279c803a384d72 Mon Sep 17 00:00:00 2001 From: Taso Dane Date: Fri, 13 Nov 2020 19:02:08 +0100 Subject: [PATCH 4/5] Remove unnecessary project param --- buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt | 3 +-- fun-packs/android-appcompat-with-views-dsl/build.gradle.kts | 2 +- fun-packs/android-appcompat/build.gradle.kts | 2 +- fun-packs/android-base-with-views-dsl/build.gradle.kts | 2 +- fun-packs/android-base/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- fun-packs/android-material-components/build.gradle.kts | 2 +- modules/activities/build.gradle.kts | 2 +- modules/alertdialog-appcompat-coroutines/build.gradle.kts | 2 +- modules/alertdialog-appcompat/build.gradle.kts | 2 +- modules/alertdialog-material/build.gradle.kts | 2 +- modules/alertdialog/build.gradle.kts | 2 +- modules/appctx/build.gradle.kts | 2 +- modules/arch-lifecycle/build.gradle.kts | 2 +- modules/arch-room/build.gradle.kts | 2 +- modules/bundle/build.gradle.kts | 2 +- modules/checkedlazy/build.gradle.kts | 2 +- modules/dimensions/build.gradle.kts | 2 +- modules/exceptions/build.gradle.kts | 2 +- modules/fragmentargs/build.gradle.kts | 2 +- modules/fragments/build.gradle.kts | 2 +- modules/initprovider/build.gradle.kts | 2 +- modules/intents/build.gradle.kts | 2 +- modules/lifecycle-coroutines/build.gradle.kts | 2 +- modules/mainhandler/build.gradle.kts | 2 +- modules/mainthread/build.gradle.kts | 2 +- modules/material-colors/build.gradle.kts | 2 +- modules/material-lists/build.gradle.kts | 2 +- modules/permissions/build.gradle.kts | 2 +- modules/preferences/build.gradle.kts | 2 +- modules/resources/build.gradle.kts | 2 +- modules/snackbar/build.gradle.kts | 2 +- modules/stetho-init/build.gradle.kts | 2 +- modules/systemservices/build.gradle.kts | 2 +- modules/toast/build.gradle.kts | 2 +- modules/typesaferecyclerview/build.gradle.kts | 2 +- modules/views-appcompat/build.gradle.kts | 2 +- modules/views-cardview/build.gradle.kts | 2 +- modules/views-coroutines-material/build.gradle.kts | 2 +- modules/views-coroutines/build.gradle.kts | 2 +- modules/views-dsl-appcompat/build.gradle.kts | 2 +- modules/views-dsl-constraintlayout/build.gradle.kts | 2 +- modules/views-dsl-coordinatorlayout/build.gradle.kts | 2 +- modules/views-dsl-ide-preview/build.gradle.kts | 2 +- modules/views-dsl-material/build.gradle.kts | 2 +- modules/views-dsl-recyclerview/build.gradle.kts | 2 +- modules/views-dsl/build.gradle.kts | 2 +- modules/views-material/build.gradle.kts | 2 +- modules/views-recyclerview/build.gradle.kts | 2 +- modules/views-selectable-appcompat/build.gradle.kts | 2 +- modules/views-selectable-constraintlayout/build.gradle.kts | 2 +- modules/views-selectable/build.gradle.kts | 2 +- modules/views/build.gradle.kts | 2 +- test-helpers/build.gradle.kts | 2 +- 54 files changed, 54 insertions(+), 55 deletions(-) diff --git a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt index 5751c6c84..97c4e626f 100644 --- a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt +++ b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt @@ -4,10 +4,9 @@ @file:Suppress("PackageDirectoryMismatch") -import org.gradle.api.Project import com.android.build.gradle.LibraryExtension as AndroidLibraryExtension -fun AndroidLibraryExtension.setDefaults(project: Project, generateBuildConfig: Boolean = false) { +fun AndroidLibraryExtension.setDefaults(generateBuildConfig: Boolean = false) { compileSdkVersion(ProjectVersions.androidSdk) buildToolsVersion(ProjectVersions.androidBuildTools) defaultConfig { diff --git a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts index ac588aa81..b8ad7db0c 100644 --- a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/fun-packs/android-appcompat/build.gradle.kts b/fun-packs/android-appcompat/build.gradle.kts index ed46940db..dd45ddc50 100644 --- a/fun-packs/android-appcompat/build.gradle.kts +++ b/fun-packs/android-appcompat/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/fun-packs/android-base-with-views-dsl/build.gradle.kts b/fun-packs/android-base-with-views-dsl/build.gradle.kts index 7c0e6e26b..eb7efa92d 100644 --- a/fun-packs/android-base-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-base-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/fun-packs/android-base/build.gradle.kts b/fun-packs/android-base/build.gradle.kts index 83989f712..7fa38d8b6 100644 --- a/fun-packs/android-base/build.gradle.kts +++ b/fun-packs/android-base/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts index 4d2ea22db..d0e508fda 100644 --- a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts +++ b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/fun-packs/android-material-components/build.gradle.kts b/fun-packs/android-material-components/build.gradle.kts index b6b90c8f3..10ffafff0 100644 --- a/fun-packs/android-material-components/build.gradle.kts +++ b/fun-packs/android-material-components/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/activities/build.gradle.kts b/modules/activities/build.gradle.kts index 8668d9883..bfe420291 100644 --- a/modules/activities/build.gradle.kts +++ b/modules/activities/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/alertdialog-appcompat-coroutines/build.gradle.kts b/modules/alertdialog-appcompat-coroutines/build.gradle.kts index e8775e608..3b2aa317b 100644 --- a/modules/alertdialog-appcompat-coroutines/build.gradle.kts +++ b/modules/alertdialog-appcompat-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/alertdialog-appcompat/build.gradle.kts b/modules/alertdialog-appcompat/build.gradle.kts index e4a3ee07c..dd4f14c33 100644 --- a/modules/alertdialog-appcompat/build.gradle.kts +++ b/modules/alertdialog-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/alertdialog-material/build.gradle.kts b/modules/alertdialog-material/build.gradle.kts index 1e64808cd..a58d82034 100644 --- a/modules/alertdialog-material/build.gradle.kts +++ b/modules/alertdialog-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/alertdialog/build.gradle.kts b/modules/alertdialog/build.gradle.kts index 2030fe000..18dc82ec9 100644 --- a/modules/alertdialog/build.gradle.kts +++ b/modules/alertdialog/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/appctx/build.gradle.kts b/modules/appctx/build.gradle.kts index 526b6ec6e..623c3b4b9 100644 --- a/modules/appctx/build.gradle.kts +++ b/modules/appctx/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/arch-lifecycle/build.gradle.kts b/modules/arch-lifecycle/build.gradle.kts index 8e81a5134..43b182f2f 100644 --- a/modules/arch-lifecycle/build.gradle.kts +++ b/modules/arch-lifecycle/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/arch-room/build.gradle.kts b/modules/arch-room/build.gradle.kts index 69208eb9e..f2f17f720 100644 --- a/modules/arch-room/build.gradle.kts +++ b/modules/arch-room/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/bundle/build.gradle.kts b/modules/bundle/build.gradle.kts index 0db422d87..6d1c75935 100644 --- a/modules/bundle/build.gradle.kts +++ b/modules/bundle/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/checkedlazy/build.gradle.kts b/modules/checkedlazy/build.gradle.kts index 1d88f631a..4072ec37a 100644 --- a/modules/checkedlazy/build.gradle.kts +++ b/modules/checkedlazy/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/dimensions/build.gradle.kts b/modules/dimensions/build.gradle.kts index 8668d9883..bfe420291 100644 --- a/modules/dimensions/build.gradle.kts +++ b/modules/dimensions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/exceptions/build.gradle.kts b/modules/exceptions/build.gradle.kts index 8668d9883..bfe420291 100644 --- a/modules/exceptions/build.gradle.kts +++ b/modules/exceptions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/fragmentargs/build.gradle.kts b/modules/fragmentargs/build.gradle.kts index fca237407..ef4bf77a9 100644 --- a/modules/fragmentargs/build.gradle.kts +++ b/modules/fragmentargs/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/fragments/build.gradle.kts b/modules/fragments/build.gradle.kts index b169364cd..d4c8417d7 100644 --- a/modules/fragments/build.gradle.kts +++ b/modules/fragments/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/initprovider/build.gradle.kts b/modules/initprovider/build.gradle.kts index 258df2ff5..cf4251175 100644 --- a/modules/initprovider/build.gradle.kts +++ b/modules/initprovider/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/intents/build.gradle.kts b/modules/intents/build.gradle.kts index 977d3ccf9..1de38df9e 100644 --- a/modules/intents/build.gradle.kts +++ b/modules/intents/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/lifecycle-coroutines/build.gradle.kts b/modules/lifecycle-coroutines/build.gradle.kts index 5c4332d45..2cf13f0d9 100644 --- a/modules/lifecycle-coroutines/build.gradle.kts +++ b/modules/lifecycle-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/mainhandler/build.gradle.kts b/modules/mainhandler/build.gradle.kts index 58b7545bd..d14acb864 100644 --- a/modules/mainhandler/build.gradle.kts +++ b/modules/mainhandler/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/mainthread/build.gradle.kts b/modules/mainthread/build.gradle.kts index 3ecef8cb1..047ecb6ef 100644 --- a/modules/mainthread/build.gradle.kts +++ b/modules/mainthread/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/material-colors/build.gradle.kts b/modules/material-colors/build.gradle.kts index 8668d9883..bfe420291 100644 --- a/modules/material-colors/build.gradle.kts +++ b/modules/material-colors/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/material-lists/build.gradle.kts b/modules/material-lists/build.gradle.kts index 94a17df88..3c5a60b2d 100644 --- a/modules/material-lists/build.gradle.kts +++ b/modules/material-lists/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/permissions/build.gradle.kts b/modules/permissions/build.gradle.kts index 5dba1df5d..6599b2d3a 100644 --- a/modules/permissions/build.gradle.kts +++ b/modules/permissions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/preferences/build.gradle.kts b/modules/preferences/build.gradle.kts index 11ec6eff7..dd47adece 100644 --- a/modules/preferences/build.gradle.kts +++ b/modules/preferences/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/resources/build.gradle.kts b/modules/resources/build.gradle.kts index 7d917d1b1..4b4331415 100644 --- a/modules/resources/build.gradle.kts +++ b/modules/resources/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/snackbar/build.gradle.kts b/modules/snackbar/build.gradle.kts index f707f99c0..a9568a1d5 100644 --- a/modules/snackbar/build.gradle.kts +++ b/modules/snackbar/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/stetho-init/build.gradle.kts b/modules/stetho-init/build.gradle.kts index 0e9d695e8..6b097c496 100644 --- a/modules/stetho-init/build.gradle.kts +++ b/modules/stetho-init/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/systemservices/build.gradle.kts b/modules/systemservices/build.gradle.kts index d9afb1f27..eb7e9d7ae 100644 --- a/modules/systemservices/build.gradle.kts +++ b/modules/systemservices/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/toast/build.gradle.kts b/modules/toast/build.gradle.kts index 530bc1edb..8c5f559dc 100644 --- a/modules/toast/build.gradle.kts +++ b/modules/toast/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro") } diff --git a/modules/typesaferecyclerview/build.gradle.kts b/modules/typesaferecyclerview/build.gradle.kts index d10ade440..3c9727a8d 100644 --- a/modules/typesaferecyclerview/build.gradle.kts +++ b/modules/typesaferecyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() sourceSets.getByName("main").java.srcDir("src/androidMain/java") } diff --git a/modules/views-appcompat/build.gradle.kts b/modules/views-appcompat/build.gradle.kts index 5e3c0443f..7ce010934 100644 --- a/modules/views-appcompat/build.gradle.kts +++ b/modules/views-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-cardview/build.gradle.kts b/modules/views-cardview/build.gradle.kts index f0415f094..0ef694aa2 100644 --- a/modules/views-cardview/build.gradle.kts +++ b/modules/views-cardview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-coroutines-material/build.gradle.kts b/modules/views-coroutines-material/build.gradle.kts index 060615723..369859c58 100644 --- a/modules/views-coroutines-material/build.gradle.kts +++ b/modules/views-coroutines-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-coroutines/build.gradle.kts b/modules/views-coroutines/build.gradle.kts index d6a5c3f17..c2d5e258a 100644 --- a/modules/views-coroutines/build.gradle.kts +++ b/modules/views-coroutines/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-appcompat/build.gradle.kts b/modules/views-dsl-appcompat/build.gradle.kts index cb6687ac7..e4f18d2b4 100644 --- a/modules/views-dsl-appcompat/build.gradle.kts +++ b/modules/views-dsl-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-constraintlayout/build.gradle.kts b/modules/views-dsl-constraintlayout/build.gradle.kts index f5bcf7c79..c1f55e224 100644 --- a/modules/views-dsl-constraintlayout/build.gradle.kts +++ b/modules/views-dsl-constraintlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-coordinatorlayout/build.gradle.kts b/modules/views-dsl-coordinatorlayout/build.gradle.kts index a734730a8..88aa7d4be 100644 --- a/modules/views-dsl-coordinatorlayout/build.gradle.kts +++ b/modules/views-dsl-coordinatorlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-ide-preview/build.gradle.kts b/modules/views-dsl-ide-preview/build.gradle.kts index 5b6986234..6f9068203 100644 --- a/modules/views-dsl-ide-preview/build.gradle.kts +++ b/modules/views-dsl-ide-preview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-material/build.gradle.kts b/modules/views-dsl-material/build.gradle.kts index a75ac9594..00f49f139 100644 --- a/modules/views-dsl-material/build.gradle.kts +++ b/modules/views-dsl-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl-recyclerview/build.gradle.kts b/modules/views-dsl-recyclerview/build.gradle.kts index fec522ca9..a16f0cd61 100644 --- a/modules/views-dsl-recyclerview/build.gradle.kts +++ b/modules/views-dsl-recyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-dsl/build.gradle.kts b/modules/views-dsl/build.gradle.kts index 75aa7f209..5a08a782f 100644 --- a/modules/views-dsl/build.gradle.kts +++ b/modules/views-dsl/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project, generateBuildConfig = true) + setDefaults(generateBuildConfig = true) } kotlin { diff --git a/modules/views-material/build.gradle.kts b/modules/views-material/build.gradle.kts index 2f0be32ad..4868a6d2c 100644 --- a/modules/views-material/build.gradle.kts +++ b/modules/views-material/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-recyclerview/build.gradle.kts b/modules/views-recyclerview/build.gradle.kts index 4ab039c8a..f09a18676 100644 --- a/modules/views-recyclerview/build.gradle.kts +++ b/modules/views-recyclerview/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-selectable-appcompat/build.gradle.kts b/modules/views-selectable-appcompat/build.gradle.kts index 141072803..f2000a172 100644 --- a/modules/views-selectable-appcompat/build.gradle.kts +++ b/modules/views-selectable-appcompat/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-selectable-constraintlayout/build.gradle.kts b/modules/views-selectable-constraintlayout/build.gradle.kts index b5e4dc74d..59fe8ced9 100644 --- a/modules/views-selectable-constraintlayout/build.gradle.kts +++ b/modules/views-selectable-constraintlayout/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views-selectable/build.gradle.kts b/modules/views-selectable/build.gradle.kts index e09316282..251718cac 100644 --- a/modules/views-selectable/build.gradle.kts +++ b/modules/views-selectable/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/modules/views/build.gradle.kts b/modules/views/build.gradle.kts index 9d19a1ae3..475436b4c 100644 --- a/modules/views/build.gradle.kts +++ b/modules/views/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { diff --git a/test-helpers/build.gradle.kts b/test-helpers/build.gradle.kts index 43a77cd81..25e46a20b 100644 --- a/test-helpers/build.gradle.kts +++ b/test-helpers/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } android { - setDefaults(project) + setDefaults() } kotlin { From a2567185f88289a0202210ce8e5ee515f0c29d1b Mon Sep 17 00:00:00 2001 From: Taso Dane Date: Fri, 13 Nov 2020 22:49:32 +0100 Subject: [PATCH 5/5] Rollback the package name in view-dsl module for backward compatibility --- modules/views-dsl/src/androidMain/AndroidManifest.xml | 5 +++++ .../src/androidMain/kotlin/splitties/views/dsl/Preview.kt | 1 + .../kotlin/splitties/views/dsl/idepreview/UiPreView.kt | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 modules/views-dsl/src/androidMain/AndroidManifest.xml diff --git a/modules/views-dsl/src/androidMain/AndroidManifest.xml b/modules/views-dsl/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..76c66d405 --- /dev/null +++ b/modules/views-dsl/src/androidMain/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + diff --git a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt index 905670797..222a73576 100644 --- a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt +++ b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/Preview.kt @@ -5,6 +5,7 @@ package splitties.views.dsl import android.view.View +import splitties.views.dsl.core.BuildConfig import splitties.views.dsl.core.Ui val View.isInPreview: Boolean diff --git a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt index 7c8257ca9..08edcb5cb 100644 --- a/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt +++ b/modules/views-dsl/src/androidMain/kotlin/splitties/views/dsl/idepreview/UiPreView.kt @@ -30,7 +30,7 @@ import kotlin.contracts.InvocationKind import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext -import splitties.views.dsl.R +import splitties.views.dsl.core.R /** * This class is dedicated to previewing `Ui` subclasses in the IDE.