From 27385e000d1942e3400a28439ac53d0ead77f55f Mon Sep 17 00:00:00 2001 From: Olmo Gallegos Date: Thu, 9 Jun 2022 09:32:56 +0200 Subject: [PATCH 1/2] chore: Update gradle, compose, kotlin and hilt versions --- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9a6fe01..4c226a8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - compose_version = "1.0.0-beta08" - dagger_hilt_version = "2.36" + compose_version = "1.0.5" + dagger_hilt_version = "2.38.1" coroutines_version = "1.4.3" accompanist_version = "0.11.1" - kotlin_version = "1.5.10" + kotlin_version = "1.5.31" } repositories { google() @@ -13,10 +13,10 @@ buildscript { gradlePluginPortal() } dependencies { - classpath "com.android.tools.build:gradle:7.1.0-alpha02" + classpath "com.android.tools.build:gradle:7.1.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0" - classpath "com.karumi:shot:5.10.5" + classpath "com.karumi:shot:5.14.1" classpath "com.google.dagger:hilt-android-gradle-plugin:$dagger_hilt_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6d40744..f2031de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Jun 14 09:19:39 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From ea4877429b7d5ace58542680ce4f73c5c8773c05 Mon Sep 17 00:00:00 2001 From: Olmo Gallegos Date: Thu, 9 Jun 2022 09:37:06 +0200 Subject: [PATCH 2/2] chore: Update compose, kotlin, sdk version --- app/build.gradle | 4 ++-- build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5dc23af..74f7ede 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,12 +9,12 @@ apply plugin: "kotlin-kapt" apply plugin: "org.jlleitschuh.gradle.ktlint" android { - compileSdk 30 + compileSdk 31 defaultConfig { applicationId "com.karumi" minSdk 21 - targetSdk 30 + targetSdk 31 versionCode 1 versionName "1.0" testInstrumentationRunner "com.karumi.TestRunner" diff --git a/build.gradle b/build.gradle index 4c226a8..3bdb26a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - compose_version = "1.0.5" + compose_version = "1.1.1" dagger_hilt_version = "2.38.1" coroutines_version = "1.4.3" accompanist_version = "0.11.1" - kotlin_version = "1.5.31" + kotlin_version = "1.6.10" } repositories { google()