From ad1db58b6a9f543e32b273c963a6e4beed06f1f4 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sun, 21 Apr 2024 22:16:47 +0200 Subject: [PATCH] chore: Upgrade AGP --- .../myzel394/numberhub/ConfigureCompose.kt | 2 +- .../numberhub/ConfigureKotlinAndroid.kt | 4 +-- gradle/libs.versions.toml | 26 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureCompose.kt b/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureCompose.kt index f6ad7b13..5ebda2b5 100644 --- a/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureCompose.kt +++ b/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureCompose.kt @@ -24,7 +24,7 @@ import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.kotlin.dsl.getByType internal fun Project.configureCompose( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *, *> ) { commonExtension.apply { buildFeatures { diff --git a/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureKotlinAndroid.kt b/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureKotlinAndroid.kt index 2715b140..7d34eb92 100644 --- a/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureKotlinAndroid.kt +++ b/build-logic/convention/src/main/java/app/myzel394/numberhub/ConfigureKotlinAndroid.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import org.jetbrains.kotlin.gradle.tasks.KotlinCompile internal fun Project.configureKotlinAndroid( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *, *>, ) { commonExtension.apply { compileSdk = 34 @@ -100,6 +100,6 @@ internal fun Project.configureKotlinAndroid( } } -fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { +fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { (this as ExtensionAware).extensions.configure("kotlinOptions", block) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec338ac2..870fa127 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] -versionCode = "37" -versionName = "Red Salsa" +versionCode = "1" +versionName = "NumberHub" -androidxBrowserBrowser = "1.7.0" -androidGradlePlugin = "8.2.2" -androidxActivityActivityCompose = "1.8.2" +androidxBrowserBrowser = "1.8.0" +androidGradlePlugin = "8.3.0" +androidxActivityActivityCompose = "1.9.0" androidxAppCompatAppCompat = "1.6.1" -androidxCompose = "1.6.1" +androidxCompose = "1.6.6" androidxComposeCompiler = "1.5.9" -androidxComposeMaterial3 = "1.2.0" -androidxCoreCoreKts = "1.12.0" +androidxComposeMaterial3 = "1.2.1" +androidxCoreCoreKts = "1.13.0" androidxGlanceGlance = "1.0.0" -androidxDatastoreDatastorePreferences = "1.0.0" +androidxDatastoreDatastorePreferences = "1.1.0" androidxEspresso = "3.5.1" -androidxHiltHiltNavigationCompose = "1.1.0" -androidxMacroBenchmark = "1.2.3" +androidxHiltHiltNavigationCompose = "1.2.0" +androidxMacroBenchmark = "1.2.4" androidxLifecycleLifecycleRuntimeCompose = "2.7.0" androidxNavigationNavigationCompose = "2.7.7" androidxProfileinstallerProfileinstaller = "1.3.1" @@ -22,12 +22,12 @@ androidxRoom = "2.6.1" androidxTest = "1.5.0" androidxTestExtJunitKtx = "1.1.5" androidxTestRunner = "1.5.2" -androidxUiAutomator = "2.2.0" +androidxUiAutomator = "2.3.0" androidxWindowWindow = "1.2.0" androidxWorkWorkRuntimeKtx = "2.9.0" comAndroidToolsDesugarJdkLibs = "2.0.4" comGithubSadellieThemmo = "1.3.0" -comGoogleDagger = "2.48.1" +comGoogleDagger = "2.49" comSquareupMoshiMoshiKotlin = "1.15.0" comSquareupRetrofit2ConverterMoshi = "2.9.0" orgJacocoOrgJacocoCore = "0.8.10" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf0ac862..5f9ee3fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -18,7 +18,7 @@ #Thu Feb 02 22:43:30 AZT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME