fix: Revert "chore: Upgrade AGP from 7.6 to 8.0 + Java, Kotlin & Comp… (

#159)

appbars/build.gradle.kts

@@ -11,7 +11,3 @@ dependencies {
     api(project(":menus"))
     implementation(AndroidX.compose.ui.tooling)
 }
-
-android {
-    namespace = "com.decathlon.vitamin.compose.appbars"
-}

appbars/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.appbars" />

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"
-}

badges/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.badges" />

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<Delete>("clean") {

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<KotlinCompile>().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")

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:_"
 

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<Project> {
         target.apply(plugin = "app.cash.licensee")
         target.configure<app.cash.licensee.LicenseeExtension> {
             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<KotlinCompile> {
         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}"
         }

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"
-}

buttons/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.buttons" />

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"
-}

cards/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.cards" />

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"
-}

checkboxes/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.decathlon.vitamin.compose.checkboxes">
+
+</manifest>

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"
-}

chips/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.chips" />

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"
-}

dividers/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.dividers"/>

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"
-}

fabs/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.fabs" />

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"
-}

foundation/foundation-assets/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.vitaminassets" />

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"
-}

foundation/foundation-icons/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.vitaminicons" />

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"
-}

foundation/foundation/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.foundation" />

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
-

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

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"
-}

menus/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.menus"/>

modals/build.gradle.kts

@@ -10,7 +10,3 @@ dependencies {
     implementation(project(":buttons"))
     implementation(AndroidX.compose.ui.tooling)
 }
-
-android {
-    namespace = "com.decathlon.vitamin.compose.modals"
-}

modals/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.modals" />

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"
-}

prices/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.prices"/>

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"
-}

progressbars/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.progressbars" />

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"
-}

quantity-pickers/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.quantity.pickers" />

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"
-}

radiobuttons/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.radiobuttons" />

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"
-}

ratings/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.decathlon.vitamin.compose.ratings" />