Merge remote-tracking branch 'origin/master' into new/http-proxy

1 files changed, 10 insertions, 43 deletions

diff --git a/build.gradle b/build.gradle
index 9333da35..faa30833 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,22 @@
 buildscript {
     ext {
-        activityVersion = '1.4.0'
-        annotationsVersion = '1.3.0'
-        appcompatVersion = '1.4.1'
+        activityVersion = '1.5.1'
+        annotationsVersion = '1.4.0'
+        appcompatVersion = '1.4.2'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
-        coreKtxVersion = '1.7.0'
-        coroutinesVersion = '1.6.1'
+        coreKtxVersion = '1.8.0'
+        coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.4.1'
+        fragmentVersion = '1.5.1'
         grpcVersion = '1.46.0'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.4.1'
-        materialComponentsVersion = '1.6.0'
+        lifecycleRuntimeKtxVersion = '2.5.1'
+        materialComponentsVersion = '1.6.1'
         preferenceVersion = '1.2.0'
         protobufGradleVersion = '0.8.18'
         protocVersion = '3.20.1'
@@ -33,47 +33,14 @@ buildscript {
     }
 }
 
-plugins {
-    id "de.undercouch.download" version "5.0.4"
-}
-
-task downloadCrowdin(type: Download) {
-	src 'https://crowdin.com/backend/download/project/wireguard.zip'
-	dest file('build/translations.zip')
-	overwrite true
-}
-
-task cleanCrowdin(type: Delete) {
-	delete 'ui/src/main/res/values-*/strings.xml'
-}
-
-task extractCrowdin(type: Copy, dependsOn: ['downloadCrowdin', 'cleanCrowdin']) {
-	mustRunAfter 'downloadCrowdin'
-	from zipTree(file('build/translations.zip'))
-	into file('build/translations')
-	doFirst {
-		delete 'build/translations'
-	}
-}
-
-task crowdin(type: Copy, dependsOn: ['extractCrowdin']) {
-    mustRunAfter 'extractCrowdin'
-    from 'build/translations/wireguard-android/ui/src/main/res'
-    into 'ui/src/main/res/'
-    doLast {
-        delete 'build/translations'
-        delete 'build/translations.zip'
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
 tasks {
     wrapper {
-        gradleVersion = "7.4.2"
-        distributionSha256Sum = "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda"
+        gradleVersion = "7.5"
+        distributionSha256Sum = "cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2"
     }
 }