Skip to content

Commit 62b6915

Browse files
committed
downgrade AGP for build issues
downgrade AGP from 8.0 to 7.4.2 as there are build issues.
1 parent 3671561 commit 62b6915

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build-logic/src/main/java/conventions/ApplicationConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ApplicationConventionPlugin : Plugin<Project> {
2323
}
2424
extensions.configure<ApplicationExtension> {
2525
configureKotlinAndroid(this)
26-
packaging {
26+
packagingOptions {
2727
resources {
2828
excludes += "/META-INF/{AL2.0,LGPL2.1}"
2929
excludes += "META-INF/DEPENDENCIES"

build-logic/src/main/java/ycharts/android/KotlinAndroid.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal fun Project.configureKotlinAndroid(
1515
) {
1616
commonExtension.apply {
1717
compileSdk = 33
18-
packaging {
18+
packagingOptions {
1919
resources {
2020
excludes += "/META-INF/{AL2.0,LGPL2.1}"
2121
excludes += "META-INF/DEPENDENCIES"
@@ -40,7 +40,7 @@ internal fun Project.configureKotlinAndroid(
4040
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
4141
tasks.withType<KotlinCompile>().configureEach {
4242
kotlinOptions {
43-
// Set JVM target to 11
43+
// Set JVM target to 17
4444
jvmTarget = JavaVersion.VERSION_11.toString()
4545
// Treat all Kotlin warnings as errors (disabled by default)
4646
// Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Define the dependency versions
33
#Project
44
#kotlin
5-
kotlinVersion = "1.8.10"
5+
kotlinVersion = "1.8.20"
66
kotlinxCoroutines = "1.6.4"
77
kotlinxSerializationJson = "1.5.0"
88
#gradle
9-
androidGradlePlugin = "8.0.0"
9+
androidGradlePlugin = "7.4.2"
1010

1111
#Modules
1212
#androidx

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat Apr 01 05:16:59 IST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
44
networkTimeout=10000
55
distributionPath=wrapper/dists
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)