diff options
| -rw-r--r-- | buildSrc/src/main/java/BaseProjectConfig.kt | 4 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 8 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 59203 -> 59536 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rwxr-xr-x | gradlew | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index b80efd6e..a829d4f7 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile */ internal fun Project.configureForRootProject() { tasks.withType<Wrapper> { - gradleVersion = "7.0.2" + gradleVersion = "7.1.1" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d" + distributionSha256Sum = "9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0" } configureBinaryCompatibilityValidator() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a1ad921..dca7c641 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ # Centralized versions for dependencies that share versions [versions] -androidx_activity = "1.3.0-beta02" +androidx_activity = "1.3.0-rc01" androidx_test = "1.4.0" -compose = "1.0.0-beta09" +compose = "1.0.0-rc01" composeSnapshot = "-" coroutines = "1.5.0" hilt = "2.37" @@ -42,7 +42,7 @@ androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" } androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="lifecycle" } androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha05" -androidx-material = "com.google.android.material:material:1.4.0-rc01" +androidx-material = "com.google.android.material:material:1.4.0" androidx-preference = "androidx.preference:preference:1.1.1" androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.1" androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01" @@ -95,7 +95,7 @@ thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-service # Testing dependencies testing-junit = "junit:junit:4.13.2" testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -testing-robolectric = "org.robolectric:robolectric:4.6-alpha-2" +testing-robolectric = "org.robolectric:robolectric:4.6" testing-sharedPrefsMock = "com.github.IvanShafran:shared-preferences-mock:1.0" androidx-testing-rules = { module = "androidx.test:rules", version.ref="androidx_test" } androidx-testing-runner = { module = "androidx.test:runner", version.ref="androidx_test" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex e708b1c0..7454180f 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1e2fd2c..17ba1902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) |