From 794e3078634f79185653903a246ce37a475e116c Mon Sep 17 00:00:00 2001 From: ManonPolle <46710837+ManonPolle@users.noreply.github.com> Date: Tue, 20 Jun 2023 16:21:52 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20Revert=20"chore:=20Upgrade=20AGP=20from?= =?UTF-8?q?=207.6=20to=208.0=20+=20Java,=20Kotlin=20&=20Comp=E2=80=A6=20(#?= =?UTF-8?q?159)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbars/build.gradle.kts | 4 - appbars/src/main/AndroidManifest.xml | 2 + badges/build.gradle.kts | 4 - badges/src/main/AndroidManifest.xml | 2 + build.gradle.kts | 8 +- buildSrc/build.gradle.kts | 17 +--- buildSrc/src/main/kotlin/Libs.kt | 1 - .../compose/VitaminComposeLibraryPlugin.kt | 16 ++-- buttons/build.gradle.kts | 4 - buttons/src/main/AndroidManifest.xml | 2 + cards/build.gradle.kts | 4 - cards/src/main/AndroidManifest.xml | 2 + checkboxes/build.gradle.kts | 4 - checkboxes/src/main/AndroidManifest.xml | 5 + chips/build.gradle.kts | 4 - chips/src/main/AndroidManifest.xml | 2 + dividers/build.gradle.kts | 4 - dividers/src/main/AndroidManifest.xml | 2 + fabs/build.gradle.kts | 4 - fabs/src/main/AndroidManifest.xml | 2 + foundation/foundation-assets/build.gradle.kts | 4 - .../src/main/AndroidManifest.xml | 2 + foundation/foundation-icons/build.gradle.kts | 4 - .../src/main/AndroidManifest.xml | 2 + foundation/foundation/build.gradle.kts | 4 - .../foundation/src/main/AndroidManifest.xml | 2 + gradle.properties | 19 +--- gradle/wrapper/gradle-wrapper.properties | 2 +- menus/build.gradle.kts | 4 - menus/src/main/AndroidManifest.xml | 2 + modals/build.gradle.kts | 4 - modals/src/main/AndroidManifest.xml | 2 + prices/build.gradle.kts | 4 - prices/src/main/AndroidManifest.xml | 2 + progressbars/build.gradle.kts | 4 - progressbars/src/main/AndroidManifest.xml | 2 + quantity-pickers/build.gradle.kts | 4 - quantity-pickers/src/main/AndroidManifest.xml | 2 + radiobuttons/build.gradle.kts | 4 - radiobuttons/src/main/AndroidManifest.xml | 2 + ratings/build.gradle.kts | 4 - ratings/src/main/AndroidManifest.xml | 2 + sample/build.gradle.kts | 23 ++--- sample/src/main/AndroidManifest.xml | 3 +- scaffolds/build.gradle.kts | 4 - scaffolds/src/main/AndroidManifest.xml | 2 + skeletons/build.gradle.kts | 4 - skeletons/src/main/AndroidManifest.xml | 2 + snackbars/build.gradle.kts | 4 - snackbars/src/main/AndroidManifest.xml | 5 + switches/build.gradle.kts | 4 - switches/src/main/AndroidManifest.xml | 2 + tabs/build.gradle.kts | 4 - tabs/src/main/AndroidManifest.xml | 2 + tags/build.gradle.kts | 4 - tags/src/main/AndroidManifest.xml | 3 + text-inputs/build.gradle.kts | 4 - text-inputs/src/main/AndroidManifest.xml | 2 + versions.properties | 95 ++----------------- vitamin/build.gradle.kts | 4 - vitamin/src/main/AndroidManifest.xml | 2 +- 61 files changed, 91 insertions(+), 256 deletions(-) create mode 100644 appbars/src/main/AndroidManifest.xml create mode 100644 badges/src/main/AndroidManifest.xml create mode 100644 buttons/src/main/AndroidManifest.xml create mode 100644 cards/src/main/AndroidManifest.xml create mode 100644 checkboxes/src/main/AndroidManifest.xml create mode 100644 chips/src/main/AndroidManifest.xml create mode 100644 dividers/src/main/AndroidManifest.xml create mode 100644 fabs/src/main/AndroidManifest.xml create mode 100644 foundation/foundation-assets/src/main/AndroidManifest.xml create mode 100644 foundation/foundation-icons/src/main/AndroidManifest.xml create mode 100644 foundation/foundation/src/main/AndroidManifest.xml create mode 100644 menus/src/main/AndroidManifest.xml create mode 100644 modals/src/main/AndroidManifest.xml create mode 100644 prices/src/main/AndroidManifest.xml create mode 100644 progressbars/src/main/AndroidManifest.xml create mode 100644 quantity-pickers/src/main/AndroidManifest.xml create mode 100644 radiobuttons/src/main/AndroidManifest.xml create mode 100644 ratings/src/main/AndroidManifest.xml create mode 100644 scaffolds/src/main/AndroidManifest.xml create mode 100644 skeletons/src/main/AndroidManifest.xml create mode 100644 snackbars/src/main/AndroidManifest.xml create mode 100644 switches/src/main/AndroidManifest.xml create mode 100644 tabs/src/main/AndroidManifest.xml create mode 100644 tags/src/main/AndroidManifest.xml create mode 100644 text-inputs/src/main/AndroidManifest.xml diff --git a/appbars/build.gradle.kts b/appbars/build.gradle.kts index 2dad18c3..2edfcc68 100644 --- a/appbars/build.gradle.kts +++ b/appbars/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { api(project(":menus")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.appbars" -} diff --git a/appbars/src/main/AndroidManifest.xml b/appbars/src/main/AndroidManifest.xml new file mode 100644 index 00000000..fd20328e --- /dev/null +++ b/appbars/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/badges/build.gradle.kts b/badges/build.gradle.kts index a68f9be6..57e63ffc 100644 --- a/badges/build.gradle.kts +++ b/badges/build.gradle.kts @@ -9,7 +9,3 @@ dependencies { api(project(":foundation:foundation")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.badges" -} diff --git a/badges/src/main/AndroidManifest.xml b/badges/src/main/AndroidManifest.xml new file mode 100644 index 00000000..c8218f1a --- /dev/null +++ b/badges/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index cf3ea44f..da286de0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,10 +90,10 @@ sonarqube { conventionalCommits { scopes = subprojects.map { module -> module.name }.toList() failureMessage = "Error : The commit message does not meet the Conventional Commit standard\n" + - "An example of a valid message is:\n" + - "feat(buttons): add the small size button\n" + - "Available scopes : ${scopes}\n" + - "More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary" + "An example of a valid message is:\n" + + "feat(buttons): add the small size button\n" + + "Available scopes : ${scopes}\n" + + "More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary" } tasks.create("clean") { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 61759f4a..b1c326a9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.8.21" + kotlin("jvm") version "1.4.31" `kotlin-dsl` } @@ -11,16 +11,7 @@ repositories { } tasks.withType().configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - apiVersion = "1.6" - } -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } + kotlinOptions.apiVersion = "1.6" } gradlePlugin { @@ -32,8 +23,8 @@ gradlePlugin { dependencies { implementation(gradleApi()) - implementation("com.android.tools.build:gradle:8.0.1") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") + implementation("com.android.tools.build:gradle:7.4.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") implementation("com.vanniktech:gradle-maven-publish-plugin:0.18.0") implementation("app.cash.licensee:licensee-gradle-plugin:1.4.1") implementation("app.cash.paparazzi:paparazzi-gradle-plugin:1.2.0") diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index f8be8471..aff0c2fa 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -3,7 +3,6 @@ object Libs { const val vitamin_assets = "com.decathlon.vitamin:foundation-assets:_" const val compose_ui = "androidx.compose.ui:ui:_" - const val compose_compiler = "androidx.compose.compiler:compiler:_" const val compose_ui_util = "androidx.compose.ui:ui-util:_" diff --git a/buildSrc/src/main/kotlin/com/decathlon/vitamin/compose/VitaminComposeLibraryPlugin.kt b/buildSrc/src/main/kotlin/com/decathlon/vitamin/compose/VitaminComposeLibraryPlugin.kt index 42a805b8..8ed6a8f2 100644 --- a/buildSrc/src/main/kotlin/com/decathlon/vitamin/compose/VitaminComposeLibraryPlugin.kt +++ b/buildSrc/src/main/kotlin/com/decathlon/vitamin/compose/VitaminComposeLibraryPlugin.kt @@ -4,7 +4,6 @@ import com.android.build.api.dsl.LibraryExtension import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies @@ -18,6 +17,7 @@ class VitaminComposeLibraryPlugin : Plugin { target.apply(plugin = "app.cash.licensee") target.configure { allow("Apache-2.0") + allow("MIT") } target.repositories { google() @@ -52,29 +52,29 @@ internal fun Project.configureAndroid() = this.extensions.getByType(LibraryExten useSupportLibrary = true } testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } composeOptions { - kotlinCompilerExtensionVersion = Libs.compose_compiler.split(":").last() + kotlinCompilerExtensionVersion = Libs.compose_ui.split(":").last() } tasks.withType { kotlinOptions { allWarningsAsErrors = true - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_11.toString() freeCompilerArgs = freeCompilerArgs + listOf( - "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.RequiresOptIn" ) } } - buildFeatures { compose = true } - packaging { + packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } diff --git a/buttons/build.gradle.kts b/buttons/build.gradle.kts index 2fbf1473..8635c2f8 100644 --- a/buttons/build.gradle.kts +++ b/buttons/build.gradle.kts @@ -12,7 +12,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.buttons" -} diff --git a/buttons/src/main/AndroidManifest.xml b/buttons/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cf7d35d4 --- /dev/null +++ b/buttons/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/cards/build.gradle.kts b/cards/build.gradle.kts index 57cd3a06..8f745405 100644 --- a/cards/build.gradle.kts +++ b/cards/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.cards" -} diff --git a/cards/src/main/AndroidManifest.xml b/cards/src/main/AndroidManifest.xml new file mode 100644 index 00000000..308dce29 --- /dev/null +++ b/cards/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/checkboxes/build.gradle.kts b/checkboxes/build.gradle.kts index 4249c545..57e63ffc 100644 --- a/checkboxes/build.gradle.kts +++ b/checkboxes/build.gradle.kts @@ -9,7 +9,3 @@ dependencies { api(project(":foundation:foundation")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.checkboxes" -} diff --git a/checkboxes/src/main/AndroidManifest.xml b/checkboxes/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cf62b399 --- /dev/null +++ b/checkboxes/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/chips/build.gradle.kts b/chips/build.gradle.kts index e2ae26b3..eb016c48 100644 --- a/chips/build.gradle.kts +++ b/chips/build.gradle.kts @@ -13,7 +13,3 @@ dependencies { testImplementation(project(":foundation:foundation-assets")) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.chips" -} diff --git a/chips/src/main/AndroidManifest.xml b/chips/src/main/AndroidManifest.xml new file mode 100644 index 00000000..8f41c760 --- /dev/null +++ b/chips/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/dividers/build.gradle.kts b/dividers/build.gradle.kts index 79a69953..8f745405 100644 --- a/dividers/build.gradle.kts +++ b/dividers/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.dividers" -} diff --git a/dividers/src/main/AndroidManifest.xml b/dividers/src/main/AndroidManifest.xml new file mode 100644 index 00000000..6c4eb0f4 --- /dev/null +++ b/dividers/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/fabs/build.gradle.kts b/fabs/build.gradle.kts index 41dee43b..55fe4551 100644 --- a/fabs/build.gradle.kts +++ b/fabs/build.gradle.kts @@ -12,7 +12,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.fabs" -} diff --git a/fabs/src/main/AndroidManifest.xml b/fabs/src/main/AndroidManifest.xml new file mode 100644 index 00000000..8d161820 --- /dev/null +++ b/fabs/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/foundation/foundation-assets/build.gradle.kts b/foundation/foundation-assets/build.gradle.kts index 975765da..f66522fe 100644 --- a/foundation/foundation-assets/build.gradle.kts +++ b/foundation/foundation-assets/build.gradle.kts @@ -10,7 +10,3 @@ dependencies { api(AndroidX.compose.ui) api(AndroidX.compose.material) } - -android { - namespace = "com.decathlon.vitamin.compose.vitaminassets" -} diff --git a/foundation/foundation-assets/src/main/AndroidManifest.xml b/foundation/foundation-assets/src/main/AndroidManifest.xml new file mode 100644 index 00000000..ed316d33 --- /dev/null +++ b/foundation/foundation-assets/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/foundation/foundation-icons/build.gradle.kts b/foundation/foundation-icons/build.gradle.kts index d66e9603..f66522fe 100644 --- a/foundation/foundation-icons/build.gradle.kts +++ b/foundation/foundation-icons/build.gradle.kts @@ -10,7 +10,3 @@ dependencies { api(AndroidX.compose.ui) api(AndroidX.compose.material) } - -android { - namespace = "com.decathlon.vitamin.compose.vitaminicons" -} diff --git a/foundation/foundation-icons/src/main/AndroidManifest.xml b/foundation/foundation-icons/src/main/AndroidManifest.xml new file mode 100644 index 00000000..e7e36e65 --- /dev/null +++ b/foundation/foundation-icons/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/foundation/foundation/build.gradle.kts b/foundation/foundation/build.gradle.kts index cd36d3d8..f66522fe 100644 --- a/foundation/foundation/build.gradle.kts +++ b/foundation/foundation/build.gradle.kts @@ -10,7 +10,3 @@ dependencies { api(AndroidX.compose.ui) api(AndroidX.compose.material) } - -android { - namespace = "com.decathlon.vitamin.compose.foundation" -} diff --git a/foundation/foundation/src/main/AndroidManifest.xml b/foundation/foundation/src/main/AndroidManifest.xml new file mode 100644 index 00000000..6a7f8e17 --- /dev/null +++ b/foundation/foundation/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6fba55eb..de037267 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,23 +32,6 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g android.useAndroidX=true - -# buildconfig is not generated at build by default since AGP 8.0 for all project. -# Next step: add this into gradle module that needs the BuildConfig file. -# https://developer.android.com/build/releases/gradle-plugin#default-changes -# https://medium.com/androiddevelopers/5-ways-to-prepare-your-app-build-for-android-studio-flamingo-release-da34616bb946 -android.defaults.buildfeatures.buildconfig=true -# nonTransitiveRClass is at true by default since AGP 8.0. -# Next step: Run the migration assistant from Android studio to migrate to Non-Transitive R Classes. -# https://developer.android.com/build/releases/gradle-plugin#default-changes -# https://medium.com/androiddevelopers/5-ways-to-prepare-your-app-build-for-android-studio-flamingo-release-da34616bb946 -android.nonTransitiveRClass=false -# AGP 8.0 generates R classes with non-final fields by default. -# Next step: Move to non-final fields. -# https://developer.android.com/build/releases/gradle-plugin#default-changes -android.nonFinalResIds=false - -kotlin.incremental=true # Kotlin code style for this project: "official" or "obsolete": +kotlin.incremental=true kotlin.code.style=official - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a09a6fd5..6ff2d102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jan 20 17:22:46 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/menus/build.gradle.kts b/menus/build.gradle.kts index 9132225d..57e63ffc 100644 --- a/menus/build.gradle.kts +++ b/menus/build.gradle.kts @@ -9,7 +9,3 @@ dependencies { api(project(":foundation:foundation")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.menus" -} diff --git a/menus/src/main/AndroidManifest.xml b/menus/src/main/AndroidManifest.xml new file mode 100644 index 00000000..02a5f4d6 --- /dev/null +++ b/menus/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/modals/build.gradle.kts b/modals/build.gradle.kts index 58a10191..74b1975b 100644 --- a/modals/build.gradle.kts +++ b/modals/build.gradle.kts @@ -10,7 +10,3 @@ dependencies { implementation(project(":buttons")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.modals" -} diff --git a/modals/src/main/AndroidManifest.xml b/modals/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b533e3be --- /dev/null +++ b/modals/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/prices/build.gradle.kts b/prices/build.gradle.kts index c72a9f81..8f745405 100644 --- a/prices/build.gradle.kts +++ b/prices/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.prices" -} diff --git a/prices/src/main/AndroidManifest.xml b/prices/src/main/AndroidManifest.xml new file mode 100644 index 00000000..e7663613 --- /dev/null +++ b/prices/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/progressbars/build.gradle.kts b/progressbars/build.gradle.kts index 6bbf1453..8f745405 100644 --- a/progressbars/build.gradle.kts +++ b/progressbars/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.progressbars" -} diff --git a/progressbars/src/main/AndroidManifest.xml b/progressbars/src/main/AndroidManifest.xml new file mode 100644 index 00000000..a23e2d69 --- /dev/null +++ b/progressbars/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/quantity-pickers/build.gradle.kts b/quantity-pickers/build.gradle.kts index 0ade5c30..8635c2f8 100644 --- a/quantity-pickers/build.gradle.kts +++ b/quantity-pickers/build.gradle.kts @@ -12,7 +12,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.quantity.pickers" -} diff --git a/quantity-pickers/src/main/AndroidManifest.xml b/quantity-pickers/src/main/AndroidManifest.xml new file mode 100644 index 00000000..2457be29 --- /dev/null +++ b/quantity-pickers/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/radiobuttons/build.gradle.kts b/radiobuttons/build.gradle.kts index 68a62d50..8f745405 100644 --- a/radiobuttons/build.gradle.kts +++ b/radiobuttons/build.gradle.kts @@ -11,7 +11,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.radiobuttons" -} diff --git a/radiobuttons/src/main/AndroidManifest.xml b/radiobuttons/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cddebcf8 --- /dev/null +++ b/radiobuttons/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/ratings/build.gradle.kts b/ratings/build.gradle.kts index db000892..769d624e 100644 --- a/ratings/build.gradle.kts +++ b/ratings/build.gradle.kts @@ -10,7 +10,3 @@ dependencies { implementation(project(":foundation:foundation-icons")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.ratings" -} diff --git a/ratings/src/main/AndroidManifest.xml b/ratings/src/main/AndroidManifest.xml new file mode 100644 index 00000000..5d786fea --- /dev/null +++ b/ratings/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index d161619b..64a0e82e 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,4 +1,5 @@ import com.decathlon.vitamin.compose.Versions +import de.fayard.refreshVersions.core.versionFor plugins { id("com.android.application") @@ -12,7 +13,6 @@ repositories { } android { - namespace = "com.decathlon.compose.sample" compileSdk = Versions.AndroidConfig.compileSdk defaultConfig { @@ -26,33 +26,24 @@ android { buildTypes { release { isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro", - ) + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_11.toString() freeCompilerArgs = freeCompilerArgs + listOf( - "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.RequiresOptIn" ) } - java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } - } - composeOptions { - kotlinCompilerExtensionVersion = Libs.compose_compiler.split(":").last() + kotlinCompilerExtensionVersion = versionFor(AndroidX.compose.ui) } buildFeatures { diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 581b890f..a893bf25 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/skeletons/build.gradle.kts b/skeletons/build.gradle.kts index 681397fe..62c01c90 100644 --- a/skeletons/build.gradle.kts +++ b/skeletons/build.gradle.kts @@ -13,7 +13,3 @@ dependencies { implementation(Google.accompanist.module("accompanist-placeholder")) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.skeletons" -} diff --git a/skeletons/src/main/AndroidManifest.xml b/skeletons/src/main/AndroidManifest.xml new file mode 100644 index 00000000..c4f2cfa1 --- /dev/null +++ b/skeletons/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/snackbars/build.gradle.kts b/snackbars/build.gradle.kts index 246b86e3..e79a34e2 100644 --- a/snackbars/build.gradle.kts +++ b/snackbars/build.gradle.kts @@ -12,7 +12,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.snackbars" -} diff --git a/snackbars/src/main/AndroidManifest.xml b/snackbars/src/main/AndroidManifest.xml new file mode 100644 index 00000000..cb690bce --- /dev/null +++ b/snackbars/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/switches/build.gradle.kts b/switches/build.gradle.kts index 40693117..57e63ffc 100644 --- a/switches/build.gradle.kts +++ b/switches/build.gradle.kts @@ -9,7 +9,3 @@ dependencies { api(project(":foundation:foundation")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.switches" -} diff --git a/switches/src/main/AndroidManifest.xml b/switches/src/main/AndroidManifest.xml new file mode 100644 index 00000000..ba27a80e --- /dev/null +++ b/switches/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tabs/build.gradle.kts b/tabs/build.gradle.kts index 9c53a54c..57e63ffc 100644 --- a/tabs/build.gradle.kts +++ b/tabs/build.gradle.kts @@ -9,7 +9,3 @@ dependencies { api(project(":foundation:foundation")) implementation(AndroidX.compose.ui.tooling) } - -android { - namespace = "com.decathlon.vitamin.compose.tabs" -} diff --git a/tabs/src/main/AndroidManifest.xml b/tabs/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4d72e31b --- /dev/null +++ b/tabs/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tags/build.gradle.kts b/tags/build.gradle.kts index 8fb8d6c8..8635c2f8 100644 --- a/tags/build.gradle.kts +++ b/tags/build.gradle.kts @@ -12,7 +12,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.tags" -} diff --git a/tags/src/main/AndroidManifest.xml b/tags/src/main/AndroidManifest.xml new file mode 100644 index 00000000..5e15c806 --- /dev/null +++ b/tags/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/text-inputs/build.gradle.kts b/text-inputs/build.gradle.kts index 618794ac..905d4df9 100644 --- a/text-inputs/build.gradle.kts +++ b/text-inputs/build.gradle.kts @@ -13,7 +13,3 @@ dependencies { implementation(AndroidX.compose.ui.tooling) testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8") } - -android { - namespace = "com.decathlon.vitamin.compose.textinputs" -} diff --git a/text-inputs/src/main/AndroidManifest.xml b/text-inputs/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4a0432f4 --- /dev/null +++ b/text-inputs/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/versions.properties b/versions.properties index 4178f1ca..e4edc071 100644 --- a/versions.properties +++ b/versions.properties @@ -8,13 +8,8 @@ #### suppress inspection "UnusedProperty" for whole file plugin.org.sonarqube=3.5.0.2730 -## # available=4.0.0.2929 plugin.org.jlleitschuh.gradle.ktlint=11.0.0 -## # available=11.1.0 -## # available=11.2.0 -## # available=11.3.1 -## # available=11.3.2 plugin.io.gitlab.arturbosch.detekt=1.19.0 ## # available=1.20.0-RC1 @@ -27,10 +22,6 @@ plugin.io.gitlab.arturbosch.detekt=1.19.0 ## # available=1.22.0-RC2 ## # available=1.22.0-RC3 ## # available=1.22.0 -## # available=1.23.0-RC1 -## # available=1.23.0-RC2 -## # available=1.23.0-RC3 -## # available=1.23.0 plugin.de.fayard.buildSrcLibs=0.51.0 @@ -41,13 +32,6 @@ version.androidx.navigation=2.5.3 ## # available=2.6.0-alpha02 ## # available=2.6.0-alpha03 ## # available=2.6.0-alpha04 -## # available=2.6.0-alpha05 -## # available=2.6.0-alpha06 -## # available=2.6.0-alpha07 -## # available=2.6.0-alpha08 -## # available=2.6.0-alpha09 -## # available=2.6.0-beta01 -## # available=2.6.0-rc01 version.com.decathlon.vitamin..foundation-assets=0.5.0-beta01 @@ -57,104 +41,45 @@ version.androidx.activity=1.6.1 ## # available=1.7.0-alpha01 ## # available=1.7.0-alpha02 ## # available=1.7.0-alpha03 -## # available=1.7.0-alpha04 -## # available=1.7.0-beta01 -## # available=1.7.0-beta02 -## # available=1.7.0-rc01 -## # available=1.7.0 -## # available=1.7.1 -## # available=1.8.0-alpha01 -## # available=1.8.0-alpha02 -## # available=1.8.0-alpha03 -## # available=1.8.0-alpha04 version.androidx.appcompat=1.6.0 -## # available=1.6.1 ## # available=1.7.0-alpha01 -## # available=1.7.0-alpha02 -version.androidx.compose.compiler=1.4.7 +version.androidx.compose.compiler=1.3.2 +## # available=1.4.0-alpha01 +## # available=1.4.0-alpha02 +## # available=1.4.0 -version.androidx.compose.ui=1.3.3 +version.androidx.compose.ui=1.3.2 +## # available=1.3.3 ## # available=1.4.0-alpha01 ## # available=1.4.0-alpha02 ## # available=1.4.0-alpha03 ## # available=1.4.0-alpha04 -## # available=1.4.0-alpha05 -## # available=1.4.0-beta01 -## # available=1.4.0-beta02 -## # available=1.4.0-rc01 -## # available=1.4.0 -## # available=1.4.1 -## # available=1.4.2 -## # available=1.4.3 -## # available=1.5.0-alpha01 -## # available=1.5.0-alpha02 -## # available=1.5.0-alpha03 -## # available=1.5.0-alpha04 version.androidx.compose.material=1.3.1 ## # available=1.4.0-alpha01 ## # available=1.4.0-alpha02 ## # available=1.4.0-alpha03 ## # available=1.4.0-alpha04 -## # available=1.4.0-alpha05 -## # available=1.4.0-beta01 -## # available=1.4.0-beta02 -## # available=1.4.0-rc01 -## # available=1.4.0 -## # available=1.4.1 -## # available=1.4.2 -## # available=1.4.3 -## # available=1.5.0-alpha01 -## # available=1.5.0-alpha02 -## # available=1.5.0-alpha03 -## # available=1.5.0-alpha04 version.google.accompanist=0.28.0 ## # available=0.29.0-alpha -## # available=0.29.1-alpha -## # available=0.29.2-rc -## # available=0.30.0 -## # available=0.30.1 -## # available=0.31.0-alpha -## # available=0.31.1-alpha -## # available=0.31.2-alpha version.androidx.core=1.9.0 ## # available=1.10.0-alpha01 -## # available=1.10.0-alpha02 -## # available=1.10.0-beta01 -## # available=1.10.0-rc01 -## # available=1.10.0 -## # available=1.10.1 -## # available=1.11.0-alpha01 -## # available=1.11.0-alpha02 -## # available=1.11.0-alpha03 -## # available=1.11.0-alpha04 -## # available=1.12.0-alpha01 -## # available=1.12.0-alpha03 -## # available=1.12.0-alpha04 version.androidx.lifecycle=2.5.1 ## # available=2.6.0-alpha01 ## # available=2.6.0-alpha02 ## # available=2.6.0-alpha03 ## # available=2.6.0-alpha04 -## # available=2.6.0-alpha05 -## # available=2.6.0-beta01 -## # available=2.6.0-rc01 -## # available=2.6.0 -## # available=2.6.1 version.androidx.savedstate=1.2.0 -## # available=1.2.1 version.androidx.test.espresso=3.5.1 -## # available=3.6.0-alpha01 version.androidx.test.ext.junit=1.1.5 -## # available=1.2.0-alpha01 version.google.android.material=1.7.0 ## # available=1.8.0-alpha01 @@ -162,12 +87,4 @@ version.google.android.material=1.7.0 ## # available=1.8.0-alpha03 ## # available=1.8.0-beta01 ## # available=1.8.0-rc01 -## # available=1.8.0 ## # available=1.9.0-alpha01 -## # available=1.9.0-alpha02 -## # available=1.9.0-beta01 -## # available=1.9.0-rc01 -## # available=1.9.0 -## # available=1.10.0-alpha01 -## # available=1.10.0-alpha02 -## # available=1.10.0-alpha03 diff --git a/vitamin/build.gradle.kts b/vitamin/build.gradle.kts index 0d7d3862..baa6a239 100644 --- a/vitamin/build.gradle.kts +++ b/vitamin/build.gradle.kts @@ -32,7 +32,3 @@ dependencies { api(project(":quantity-pickers")) api(project(":scaffolds")) } - -android { - namespace = "com.decathlon.vitamin.compose.vitamin" -} diff --git a/vitamin/src/main/AndroidManifest.xml b/vitamin/src/main/AndroidManifest.xml index 568741e5..415f7fd1 100644 --- a/vitamin/src/main/AndroidManifest.xml +++ b/vitamin/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file