Update to R beta 1

build.gradle.kts

@@ -1,7 +1,3 @@
-plugins {
-    id("com.github.ben-manes.versions") version "0.28.0"
-}
-
 buildscript {
     val kotlinVersion = "1.3.72"
     extra.set("kotlinVersion", kotlinVersion)
@@ -13,7 +9,7 @@ buildscript {
 
     dependencies {
         classpath(kotlin("gradle-plugin", kotlinVersion))
-        classpath("com.android.tools.build:gradle:4.0.0")
+        classpath("com.android.tools.build:gradle:4.1.0-beta01")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.1.1")
         classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

mobile/build.gradle.kts

@@ -11,11 +11,11 @@ plugins {
 android {
     val javaVersion = JavaVersion.VERSION_1_8
     compileOptions {
-        coreLibraryDesugaringEnabled = true
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion
     }
-    compileSdkVersion("android-R")
+    compileSdkVersion(30)
     kotlinOptions {
         freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
         jvmTarget = javaVersion.toString()
@@ -23,15 +23,14 @@ android {
     defaultConfig {
         applicationId = "be.mygod.vpnhotspot"
         minSdkVersion(21)
-        targetSdkVersion("R")
+        targetSdkVersion(30)
         resConfigs(listOf("it", "ru", "zh-rCN", "zh-rTW"))
         versionCode = 224
         versionName = "2.9.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        javaCompileOptions.annotationProcessorOptions.arguments = mapOf(
+        javaCompileOptions.annotationProcessorOptions.arguments(mapOf(
                 "room.incremental" to "true",
-                "room.schemaLocation" to "$projectDir/schemas"
-        )
+                "room.schemaLocation" to "$projectDir/schemas"))
         buildConfigField("boolean", "DONATIONS", "true")
     }
     buildFeatures {
@@ -75,7 +74,7 @@ dependencies {
     implementation("androidx.browser:browser:1.2.0")
     implementation("androidx.core:core-ktx:1.3.0-rc01")
     implementation("androidx.emoji:emoji:1.1.0-rc01")
-    implementation("androidx.fragment:fragment-ktx:1.3.0-alpha05")
+    implementation("androidx.fragment:fragment-ktx:1.3.0-alpha06")
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
@@ -86,8 +85,8 @@ dependencies {
     implementation("com.github.topjohnwu.libsu:core:2.5.1")
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
     implementation("com.google.android.material:material:1.2.0-beta01")
-    implementation("com.google.firebase:firebase-analytics-ktx:17.4.2")
-    implementation("com.google.firebase:firebase-crashlytics:17.0.0")
+    implementation("com.google.firebase:firebase-analytics-ktx:17.4.3")
+    implementation("com.google.firebase:firebase-crashlytics:17.0.1")
     implementation("com.google.zxing:core:3.4.0")
     implementation("com.jakewharton.timber:timber:4.7.1")
     implementation("com.linkedin.dexmaker:dexmaker:2.25.1")