From a881a1f663d55c0268b9e4ea38da91576c9f7917 Mon Sep 17 00:00:00 2001 From: Swapnil Musale Date: Thu, 6 Jun 2024 01:48:07 +0530 Subject: [PATCH] Update Dependencies --- .github/workflows/android_cd.yml | 6 ++--- .github/workflows/android_ci.yml | 4 ++-- .gitignore | 1 + app/build.gradle.kts | 8 +++---- build.gradle.kts | 1 + data/build.gradle.kts | 4 ++-- domain/build.gradle.kts | 4 ++-- gradle.properties | 3 ++- gradle/libs.versions.toml | 40 ++++++++++++++++---------------- 9 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.github/workflows/android_cd.yml b/.github/workflows/android_cd.yml index 0c9062e..b0612b1 100644 --- a/.github/workflows/android_cd.yml +++ b/.github/workflows/android_cd.yml @@ -32,10 +32,10 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - - name: Set Up JDK 17 + - name: Set Up JDK 18 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '1.8' distribution: 'temurin' cache: gradle @@ -81,7 +81,7 @@ jobs: app/build/outputs/bundle/release/ - name: Create Github Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: generate_release_notes: true prerelease: false diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml index ab033a9..8c6d2c0 100644 --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -40,10 +40,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set Up JDK 17 + - name: Set Up JDK 18 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '1.8' distribution: 'temurin' cache: gradle diff --git a/.gitignore b/.gitignore index 16dcd12..09926cb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ captures/ .cxx/ *.apk output.json +.kotlin # IntelliJ *.iml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b5b1c35..ec7be57 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.hilt) alias(libs.plugins.kotlin.ksp) alias(libs.plugins.detekt) + alias(libs.plugins.compose.compiler) } tasks.configureEach { if (name == "compileDebugKotlin") { @@ -43,8 +44,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() @@ -53,9 +54,6 @@ android { compose = true buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get() - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index fc6c048..bb94f30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.hilt) apply false alias(libs.plugins.kotlin.ksp) apply false + alias(libs.plugins.compose.compiler) apply(false) alias(libs.plugins.detekt) } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index c75ae2e..09ab260 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -32,8 +32,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 23ebf6d..2ce0e4a 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -15,6 +15,6 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/gradle.properties b/gradle.properties index 4dbe77b..ccaa3af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,5 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true org.gradle.caching=true -org.gradle.configuration-cache=true \ No newline at end of file +org.gradle.configuration-cache=true +kotlin.jvm.target.validation.mode = IGNORE \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d821c0..ebe8808 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,34 +1,33 @@ [versions] # Plugin Version -androidGradlePlugin = "8.2.2" -androidLibrary = "8.2.2" -kotlinAndroid = "1.9.21" -kotlinJvm = "1.9.21" -androidxComposeCompiler = "1.5.7" -jvmTarget = "17" -kotlinKsp = "1.9.22-1.0.17" +androidGradlePlugin = "8.4.1" +androidLibrary = "8.4.1" +kotlin = "2.0.0" +jvmTarget = "1.8" +kotlinKsp = "2.0.0-1.0.21" detektVersion = "1.23.5" # Library Version -coreKtx = "1.12.0" +kotlinBOM = "1.9.23" +composeBOM = "2024.05.00" + +coreKtx = "1.13.1" splashScreen = "1.0.1" -activityCompose = "1.8.2" +activityCompose = "1.9.0" composeNavigation = "2.7.7" -composeBOM = "2024.02.00" -kotlinBOM = "1.9.22" -androidXLifecycle = "2.7.0" -androidMaterial3 = "1.2.0" -hiltAndroid = "2.50" +androidXLifecycle = "2.8.1" +androidMaterial3 = "1.2.1" +hiltAndroid = "2.51.1" retrofit = "2.9.0" okHttp3 = "4.12.0" moshi = "1.15.1" javaxInject = "1" -hiltNavigation = "1.1.0" -konsist = "0.13.0" +hiltNavigation = "1.2.0" +konsist = "0.15.0" # Testing Library Version -junit4 = "1.6.1" +junit4 = "1.6.7" junit = "4.13.2" junitExtension = "1.1.5" espressoCore = "3.5.1" @@ -87,9 +86,10 @@ retrofit = ["retrofit", "moshi-converter", "okhttp3", "loggin-interceptor"] [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-library = { id = "com.android.library", version.ref = "androidLibrary" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" } -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinJvm" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } java-library = { id = "java-library" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" } kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlinKsp" } -detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" } \ No newline at end of file +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } \ No newline at end of file