From 02e88c3faec9b5f16e81b3f35b641f3970f3947e Mon Sep 17 00:00:00 2001 From: AndroidDeveloperLB Date: Fri, 20 Sep 2024 02:52:54 +0300 Subject: [PATCH] Updated dependencies and others, to make the repository build fine again. --- app/build.gradle.kts | 27 ++++++++++++------------ build.gradle.kts | 10 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- jxlcoderglide/build.gradle.kts | 23 ++++++++++---------- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7daa568..5452535 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,16 +2,18 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") + // this version matches your Kotlin version https://developer.android.com/develop/ui/compose/compiler#set-gradle + id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" } android { namespace = "com.awxkee.jxlcoder.app.glide" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.awxkee.jxlcoder.app.glide" minSdk = 21 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" @@ -31,11 +33,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" } buildFeatures { compose = true @@ -52,18 +54,17 @@ android { dependencies { - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") - implementation("androidx.activity:activity-compose:1.7.2") - implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation("androidx.core:core-ktx:1.13.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6") + implementation("androidx.activity:activity-compose:1.9.2") + implementation(platform("androidx.compose:compose-bom:2024.09.02")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00")) + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") @@ -73,4 +74,4 @@ dependencies { implementation(project(":jxlcoderglide")) // implementation("com.github.awxkee:jxl-coder-glide:1.5.1") implementation("com.github.bumptech.glide:compose:1.0.0-alpha.5") -} \ No newline at end of file +} diff --git a/build.gradle.kts b/build.gradle.kts index 6331baa..da93766 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.4.0-rc02" apply false - id("org.jetbrains.kotlin.android") version "1.8.10" apply false - id("com.android.library") version "8.4.0-rc02" apply false - id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false -} \ No newline at end of file + id("com.android.application") version "8.6.1" apply false + id("org.jetbrains.kotlin.android") version "2.0.20" apply false + id("com.android.library") version "8.6.1" apply false + id("com.google.devtools.ksp") version "2.0.20-1.0.25" apply false +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b113f97..e88b62a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Sep 18 23:05:09 MYT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jxlcoderglide/build.gradle.kts b/jxlcoderglide/build.gradle.kts index d4f2134..357a098 100644 --- a/jxlcoderglide/build.gradle.kts +++ b/jxlcoderglide/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("maven-publish") id("signing") id("com.vanniktech.maven.publish") version "0.28.0" - id("kotlin-kapt") + id("com.google.devtools.ksp") } task("androidSourcesJar", Jar::class) { @@ -85,22 +85,23 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" } } dependencies { - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") + implementation("androidx.core:core-ktx:1.13.1") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") implementation("com.github.bumptech.glide:glide:4.16.0") - kapt("com.github.bumptech.glide:compiler:4.16.0") + ksp("com.github.bumptech.glide:ksp:4.16.0") + api("io.github.awxkee:jxl-coder:2.3.0") -} \ No newline at end of file +}