Merge pull request #159 from sschueller/develop

Release 1.0.34
sschueller · May 16, 2020 · 7af3b4d · 7af3b4d
2 parents 0877f22 + e27e75a
commit 7af3b4d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 1.0.34 Tag: v1.0.34 (2020-05-16)
+ * Gradle updates
+
+### Version 1.0.33 Tag: v1.0.33 (2020-01-05)
+ * Fixed crashes
+
 ### Version 1.0.32 Tag: v1.0.32 (2020-01-04)
  * Gradle update
  * Translations

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1032
-        versionName "1.0.32"
+        versionCode 1034
+        versionName "1.0.34"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ext {
             libVersions = [
@@ -23,15 +23,15 @@ android {
             implementation 'androidx.cardview:cardview:1.0.0'
             implementation 'androidx.recyclerview:recyclerview:1.1.0'
             implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-            implementation 'com.google.android.material:material:1.0.0'
+            implementation 'com.google.android.material:material:1.1.0'
             implementation 'de.hdodenhof:circleimageview:3.0.0'
 
             // font awesome
             implementation "com.mikepenz:iconics-core:3.1.0"
             implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
 
             // http client / REST
-            implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+            implementation 'com.squareup.okhttp3:okhttp:4.3.1'
             implementation 'com.squareup.retrofit2:retrofit:2.5.0'
 
             // image downloading and caching library
@@ -77,7 +77,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
@@ -32,7 +32,6 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
-import android.util.Patterns;
 import android.view.MenuItem;
 import android.widget.Toast;
 
@@ -221,7 +220,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                                              Preference preference) {
             String key = preference.getKey();
-            if (key.equals("pref_api_base")) {
+            if ("pref_api_base".equals(key)) {
                 Intent intentServer = new Intent(preference.getContext(), SelectServerActivity.class);
                 startActivity(intentServer);
                 return true;

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jan 04 21:19:41 CET 2020
+#Sat May 16 15:51:28 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip