From ae9caabea180817e722642212160bd30d934e79f Mon Sep 17 00:00:00 2001 From: Kartik Arora Date: Tue, 3 Oct 2023 13:42:40 +1100 Subject: [PATCH] iguana 6 and gradle dependency versions plugin --- build.gradle.kts | 11 +++++++++++ buildSrc/build.gradle.kts | 1 + buildSrc/src/main/kotlin/AndroidConfig.kt | 2 +- buildSrc/src/main/kotlin/Libraries.kt | 3 +++ buildSrc/src/main/kotlin/Versions.kt | 21 +++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5183e0b..5831484 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,16 @@ +import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask + // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version Versions.gradlePlugin apply false id("org.jetbrains.kotlin.android") version Versions.kotlin apply false + id("com.github.ben-manes.versions") version Versions.gradleVersionsPlugin +} + +tasks.named("dependencyUpdates").configure { + // optional parameters + checkForGradleUpdate = true + outputFormatter = "html" + outputDir = "build/dependencyUpdates" + reportfileName = "report" } \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 77f0bd9..be5f43a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -6,4 +6,5 @@ plugins { repositories { google() mavenCentral() + gradlePluginPortal() } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index 6320524..62ef2ac 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -5,6 +5,6 @@ object AndroidConfig { const val TargetSdk = "34" const val VersionName = "0.2.2" const val Namespace = "me.kartikarora.android14" - const val KotlinCompilerExtensionVersion = "1.5.0-dev-k1.9.0-6a60475e07f" + const val KotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf" const val BuildTools = "34.0.0" } diff --git a/buildSrc/src/main/kotlin/Libraries.kt b/buildSrc/src/main/kotlin/Libraries.kt index d74e3b0..3c07c37 100644 --- a/buildSrc/src/main/kotlin/Libraries.kt +++ b/buildSrc/src/main/kotlin/Libraries.kt @@ -23,4 +23,7 @@ object Libraries { // coil const val coil = "io.coil-kt:coil-compose:${Versions.coil}" + + // GVP + const val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:${Versions.gradleVersionsPlugin}" } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3fb6968..c4e3446 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,14 +1,15 @@ object Versions { - const val coil = "2.3.0" - const val navigationCompose = "2.5.3" - const val activity = "1.8.0-alpha06" - const val coreKtx = "1.12.0-alpha05" - const val appcompat = "1.7.0-alpha02" - const val composeBOM = "2023.06.01" - const val composeUiTooling = "1.6.0-alpha01" + const val coil = "2.4.0" + const val navigationCompose = "2.7.3" + const val activity = "1.8.0-rc01" + const val coreKtx = "1.12.0" + const val appcompat = "1.7.0-alpha03" + const val composeBOM = "2023.09.02" + const val composeUiTooling = "1.6.0-alpha06" const val junit = "4.13.2" - const val lifecycle = "2.6.1" + const val lifecycle = "2.7.0-alpha02" + const val gradleVersionsPlugin = "0.48.0" - const val gradlePlugin = "8.3.0-alpha05" - const val kotlin = "1.9.0" + const val gradlePlugin = "8.3.0-alpha06" + const val kotlin = "1.9.20-Beta2" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45c3994..077c8d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Sep 22 11:39:18 AEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists