Skip to content

Commit 794e307

Browse files
authored
fix: Revert "chore: Upgrade AGP from 7.6 to 8.0 + Java, Kotlin & Comp… (#159)
1 parent a8e28a5 commit 794e307

File tree

61 files changed

+91
-256
lines changed

Some content is hidden

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

61 files changed

+91
-256
lines changed

appbars/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@ dependencies {
1111
api(project(":menus"))
1212
implementation(AndroidX.compose.ui.tooling)
1313
}
14-
15-
android {
16-
namespace = "com.decathlon.vitamin.compose.appbars"
17-
}

appbars/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest package="com.decathlon.vitamin.compose.appbars" />

badges/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,3 @@ dependencies {
99
api(project(":foundation:foundation"))
1010
implementation(AndroidX.compose.ui.tooling)
1111
}
12-
13-
android {
14-
namespace = "com.decathlon.vitamin.compose.badges"
15-
}

badges/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest package="com.decathlon.vitamin.compose.badges" />

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ sonarqube {
9090
conventionalCommits {
9191
scopes = subprojects.map { module -> module.name }.toList()
9292
failureMessage = "Error : The commit message does not meet the Conventional Commit standard\n" +
93-
"An example of a valid message is:\n" +
94-
"feat(buttons): add the small size button\n" +
95-
"Available scopes : ${scopes}\n" +
96-
"More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary"
93+
"An example of a valid message is:\n" +
94+
"feat(buttons): add the small size button\n" +
95+
"Available scopes : ${scopes}\n" +
96+
"More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary"
9797
}
9898

9999
tasks.create<Delete>("clean") {

buildSrc/build.gradle.kts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.8.21"
4+
kotlin("jvm") version "1.4.31"
55
`kotlin-dsl`
66
}
77

@@ -11,16 +11,7 @@ repositories {
1111
}
1212

1313
tasks.withType<KotlinCompile>().configureEach {
14-
kotlinOptions {
15-
jvmTarget = JavaVersion.VERSION_17.toString()
16-
apiVersion = "1.6"
17-
}
18-
}
19-
20-
java {
21-
toolchain {
22-
languageVersion.set(JavaLanguageVersion.of(17))
23-
}
14+
kotlinOptions.apiVersion = "1.6"
2415
}
2516

2617
gradlePlugin {
@@ -32,8 +23,8 @@ gradlePlugin {
3223

3324
dependencies {
3425
implementation(gradleApi())
35-
implementation("com.android.tools.build:gradle:8.0.1")
36-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
26+
implementation("com.android.tools.build:gradle:7.4.0")
27+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
3728
implementation("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
3829
implementation("app.cash.licensee:licensee-gradle-plugin:1.4.1")
3930
implementation("app.cash.paparazzi:paparazzi-gradle-plugin:1.2.0")

buildSrc/src/main/kotlin/Libs.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ object Libs {
33
const val vitamin_assets = "com.decathlon.vitamin:foundation-assets:_"
44

55
const val compose_ui = "androidx.compose.ui:ui:_"
6-
const val compose_compiler = "androidx.compose.compiler:compiler:_"
76

87
const val compose_ui_util = "androidx.compose.ui:ui-util:_"
98

buildSrc/src/main/kotlin/com/decathlon/vitamin/compose/VitaminComposeLibraryPlugin.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.android.build.api.dsl.LibraryExtension
44
import org.gradle.api.JavaVersion
55
import org.gradle.api.Plugin
66
import org.gradle.api.Project
7-
import org.gradle.jvm.toolchain.JavaLanguageVersion
87
import org.gradle.kotlin.dsl.apply
98
import org.gradle.kotlin.dsl.configure
109
import org.gradle.kotlin.dsl.dependencies
@@ -18,6 +17,7 @@ class VitaminComposeLibraryPlugin : Plugin<Project> {
1817
target.apply(plugin = "app.cash.licensee")
1918
target.configure<app.cash.licensee.LicenseeExtension> {
2019
allow("Apache-2.0")
20+
allow("MIT")
2121
}
2222
target.repositories {
2323
google()
@@ -52,29 +52,29 @@ internal fun Project.configureAndroid() = this.extensions.getByType(LibraryExten
5252
useSupportLibrary = true
5353
}
5454
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
55+
5556
}
5657
compileOptions {
57-
sourceCompatibility = JavaVersion.VERSION_17
58-
targetCompatibility = JavaVersion.VERSION_17
58+
sourceCompatibility = JavaVersion.VERSION_11
59+
targetCompatibility = JavaVersion.VERSION_11
5960
}
6061
composeOptions {
61-
kotlinCompilerExtensionVersion = Libs.compose_compiler.split(":").last()
62+
kotlinCompilerExtensionVersion = Libs.compose_ui.split(":").last()
6263
}
6364
tasks.withType<KotlinCompile> {
6465
kotlinOptions {
6566
allWarningsAsErrors = true
66-
jvmTarget = JavaVersion.VERSION_17.toString()
67+
jvmTarget = JavaVersion.VERSION_11.toString()
6768
freeCompilerArgs = freeCompilerArgs + listOf(
68-
"-opt-in=kotlin.RequiresOptIn",
69+
"-opt-in=kotlin.RequiresOptIn"
6970
)
7071
}
7172
}
72-
7373
buildFeatures {
7474
compose = true
7575
}
7676

77-
packaging {
77+
packagingOptions {
7878
resources {
7979
excludes += "/META-INF/{AL2.0,LGPL2.1}"
8080
}

buttons/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ dependencies {
1212
implementation(AndroidX.compose.ui.tooling)
1313
testImplementation("com.google.testparameterinjector:test-parameter-injector:1.8")
1414
}
15-
16-
android {
17-
namespace = "com.decathlon.vitamin.compose.buttons"
18-
}

buttons/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest package="com.decathlon.vitamin.compose.buttons" />

0 commit comments

Comments
 (0)