Use gradle 5.6.3 / build-plugin 3.5.1 / appengine 2.2.0

android/build.gradle

@@ -127,11 +127,14 @@ dependencies {
     androidTestImplementation 'androidx.test:core:1.2.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.2.0'
     androidTestImplementation "org.mockito:mockito-core:$mockito_version"
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
     androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
     androidTestImplementation 'com.google.android.material:material:1.0.0'
+    androidTestImplementation 'org.threeten:threetenbp:1.4.0'
+
 
     implementation 'com.github.ligi:TouchImageView:2.1'
     implementation 'com.github.ligi:ExtraCompats:0.5'

backend/build.gradle

@@ -1,15 +1,9 @@
-// If you would like more information on the gradle-appengine-plugin please refer to the github page
-// https://github.com/GoogleCloudPlatform/gradle-appengine-plugin
-
-// TODO: migrate to new version
-// see https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java/migrating-android
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.google.appengine:gradle-appengine-plugin:1.9.59'
+        classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.2.0'
     }
 }
 
@@ -19,30 +13,15 @@ repositories {
 
 apply plugin: 'java'
 apply plugin: 'war'
-apply plugin: 'appengine'
+apply plugin: 'com.google.cloud.tools.appengine'
 
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    // FIXME: This *needs* to be migrated to the new gradle plugin!
-    // https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java/migrating-android
-    // https://github.com/GoogleCloudPlatform/app-gradle-plugin
-    appengineSdk 'com.google.appengine:appengine-java-sdk:1.9.59'
-    compile 'com.google.appengine:appengine-endpoints:1.9.59'
-    compile 'com.google.appengine:appengine-endpoints-deps:1.9.59'
-    compile 'javax.servlet:javax.servlet-api:4.0.1'
-    compile 'com.googlecode.objectify:objectify:4.1.3'
-    compile 'com.ganyo:gcm-server:1.1.0'
-}
-
-appengine {
-    downloadSdk = true
-    appcfg {
-        oauth2 = true
-    }
-    endpoints {
-        getClientLibsOnBuild = true
-        getDiscoveryDocsOnBuild = true
-    }
+    implementation 'com.google.appengine:appengine-endpoints:1.9.59'
+    implementation 'com.google.appengine:appengine-endpoints-deps:1.9.59'
+    implementation 'javax.servlet:javax.servlet-api:4.0.1'
+    implementation 'com.googlecode.objectify:objectify:4.1.3'
+    implementation 'com.ganyo:gcm-server:1.1.0'
 }

build.gradle

@@ -13,8 +13,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: upgrade requires to migrate backend to the new app-engine plugin, see backend/build.gradle
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         // FIXME: this causes deprecation warnings and should be replaced
         classpath 'com.jaredsburrows:gradle-spoon-plugin:1.5.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`