Merge branch 'development' into master

aaronjwood · Sep 1, 2020 · 6b9d34c · 6b9d34c
2 parents a365e70 + dea70c7
commit 6b9d34c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 60
-        versionName "2.3.2"
+        versionCode 61
+        versionName "2.3.3"
         applicationId "com.aaronjwood.portauthority"
         setProperty("archivesBaseName", "PortAuthority-$versionName")
     }

diff --git a/app/src/main/java/com/aaronjwood/portauthority/async/WanIpAsyncTask.java b/app/src/main/java/com/aaronjwood/portauthority/async/WanIpAsyncTask.java
@@ -15,7 +15,7 @@
 public class WanIpAsyncTask extends AsyncTask<Void, Void, String> {
 
     // IP service is 100% open source https://github.com/aaronjwood/public-ip-api
-    private static final String EXTERNAL_IP_SERVICE = "https://public-ip-api.appspot.com/";
+    private static final String EXTERNAL_IP_SERVICE = "https://yourip.aaronjwood.com/";
     private final WeakReference<MainAsyncResponse> delegate;
 
     /**

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.4'
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 25 19:13:51 PST 2020
+#Sun Jul 05 09:51:31 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip