Update

HMBSbige · Dec 21, 2020 · 56343a8 · 56343a8
1 parent 2670e4f
commit 56343a8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,22 +46,22 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.evernote:android-job:1.4.2'
-    implementation 'androidx.work:work-runtime:2.2.0'
+    implementation 'androidx.work:work-runtime:2.4.0'
     implementation "com.github.clans:fab:1.6.4"
     implementation "com.github.jorgecastilloprz:fabprogresscircle:1.01"
     implementation "com.google.android.gms:play-services-analytics:17.0.0"
-    implementation "com.j256.ormlite:ormlite-android:5.1"
-    implementation 'com.mikepenz:iconics-core:4.0.2'
-    implementation "com.mikepenz:materialdrawer:6.1.2"
+    implementation 'com.j256.ormlite:ormlite-android:5.3'
+    implementation 'com.mikepenz:iconics-core:5.2.1'
+    implementation 'com.mikepenz:materialdrawer:8.3.0'
     implementation "com.twofortyfouram:android-plugin-api-for-locale:1.0.4"
-    implementation "dnsjava:dnsjava:2.1.9"
+    implementation 'dnsjava:dnsjava:3.3.1'
     implementation "me.dm7.barcodescanner:zxing:1.9.13"
     implementation "net.glxn.qrgen:android:2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.2.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 

diff --git a/app/src/main/java/com/bige0/shadowsocksr/utils/Utils.kt b/app/src/main/java/com/bige0/shadowsocksr/utils/Utils.kt
@@ -198,8 +198,8 @@ object Utils
 		val metrics = DisplayMetrics()
 		window.windowManager.defaultDisplay.getMetrics(metrics)
 		val toastView = toast.view
-		toastView.measure(View.MeasureSpec.makeMeasureSpec(metrics.widthPixels, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(metrics.heightPixels, View.MeasureSpec.UNSPECIFIED))
-		toast.setGravity(Gravity.START or Gravity.TOP, viewLocation[0] - rect.left + (view.width - toast.view.measuredWidth) / 2 + offsetX, viewLocation[1] - rect.top + view.height + offsetY)
+		toastView!!.measure(View.MeasureSpec.makeMeasureSpec(metrics.widthPixels, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(metrics.heightPixels, View.MeasureSpec.UNSPECIFIED))
+		toast.setGravity(Gravity.START or Gravity.TOP, viewLocation[0] - rect.left + (view.width - toast.view!!.measuredWidth) / 2 + offsetX, viewLocation[1] - rect.top + view.height + offsetY)
 		return toast
 	}
 

diff --git a/build.gradle b/build.gradle
@@ -3,12 +3,12 @@
 buildscript {
     ext {
         javaVersion = JavaVersion.VERSION_1_8
-        kotlinVersion = '1.3.50'
+        kotlinVersion = '1.4.21'
         minSdkVersion = 21
-        sdkVersion = 29
-        compileSdkVersion = 29
-        versionCode = 1
-        versionName = '3.6.0'
+        sdkVersion = 30
+        compileSdkVersion = 30
+        versionCode = 2
+        versionName = '3.7.0'
     }
     repositories {
         google()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 21 21:15:37 CST 2020
+#Mon Dec 21 22:02:32 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip