summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/draft_new_release.yml2
-rw-r--r--.github/workflows/sync_crowdin.yml2
-rw-r--r--.github/workflows/update_publicsuffix_data.yml2
-rw-r--r--buildSrc/src/main/java/BaseProjectConfig.kt4
-rw-r--r--gradle/libs.versions.toml4
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
6 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml
index 03993449..329d111b 100644
--- a/.github/workflows/draft_new_release.yml
+++ b/.github/workflows/draft_new_release.yml
@@ -75,7 +75,7 @@ jobs:
git commit -m "build: bump version"
- name: Create Pull Request
- uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
+ uses: peter-evans/create-pull-request@01f7dd1d28f5131231ba3ede0f1c8cb413584a1d
with:
author: GitHub Actions <noreply@github.com>
body: This is an automated pull request to bump the changelog for the ${{ github.event.milestone.title }} release.
diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml
index b6e2076f..23b9e027 100644
--- a/.github/workflows/sync_crowdin.yml
+++ b/.github/workflows/sync_crowdin.yml
@@ -21,7 +21,7 @@ jobs:
run: if [[ $(git diff --stat) != '' ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi
- name: Create Pull Request
- uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
+ uses: peter-evans/create-pull-request@01f7dd1d28f5131231ba3ede0f1c8cb413584a1d
if: env.UPDATED == 'true'
with:
assignees: msfjarvis
diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml
index 41689133..6ef3527d 100644
--- a/.github/workflows/update_publicsuffix_data.yml
+++ b/.github/workflows/update_publicsuffix_data.yml
@@ -17,7 +17,7 @@ jobs:
run: if [[ $(git diff --binary --stat) != '' ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi
- name: Create Pull Request
- uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
+ uses: peter-evans/create-pull-request@01f7dd1d28f5131231ba3ede0f1c8cb413584a1d
if: env.UPDATED == 'true'
with:
assignees: msfjarvis
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 55ee772e..bbfce514 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.1"
+ gradleVersion = "7.0.2"
distributionType = Wrapper.DistributionType.ALL
- distributionSha256Sum = "ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265"
+ distributionSha256Sum = "13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d"
}
configureBinaryCompatibilityValidator()
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4cc0a5d3..d406c3ce 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
# Centralized versions for dependencies that share versions
[versions]
androidx_test = "1.4.0-alpha06"
-coroutines = "1.5.0-RC"
+coroutines = "1.5.0"
hilt = "2.35.1"
kotlin = "1.5.0"
lifecycle = "2.4.0-alpha01"
@@ -75,7 +75,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.5.1"
+testing-robolectric = "org.robolectric:robolectric:4.6-alpha-1"
androidx-testing-rules = { module = "androidx.test:rules", version.ref="androidx_test" }
androidx-testing-runner = { module = "androidx.test:runner", version.ref="androidx_test" }
kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 099f1006..e1e2fd2c 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=ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
+distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists