Update to gradle 5 and update support dependencies

Author: DD Liu

.gitignore

@@ -23,3 +23,6 @@
 # Gradle:
 .idea/gradle.xml
 .idea/libraries
+
+.idea/caches/*
+.idea/modules.xml

.idea/encodings.xml

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.scratchjr.android"
@@ -15,22 +15,24 @@ android {
         }
     }
 
+    flavorDimensions 'scratchjrversion'
     productFlavors {
         free {
+            dimension = 'scratchjrversion'
             applicationId "org.scratchjr.androidfree"
             minSdkVersion 19
-            targetSdkVersion 27
+            targetSdkVersion 28
             versionCode 21
             versionName "1.2.0"
         }
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:support-v4:27.1.0'
-    compile 'com.google.android.gms:play-services-analytics:15.0.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.gms:play-services-analytics:17.0.0'
 }
 
 def appModuleRootFolder = '.'
@@ -89,13 +91,12 @@ class CleanScratchJrResourcesTask extends DefaultTask {
 
 task generateScratchJrPNGs(type: GenerateScratchJrPNGsTask)
 task cleanScratchJrResources(type: CleanScratchJrResourcesTask)
+assemble.dependsOn switchToFree
 
 afterEvaluate {
     preBuild.dependsOn generateWebpackBundle
     processFreeDebugGoogleServices.dependsOn switchToFreeGA
     processFreeReleaseGoogleServices.dependsOn switchToFreeGA
-    prepareFreeDebugDependencies.dependsOn switchToFree
-    prepareFreeReleaseDependencies.dependsOn switchToFree
 
     generateFreeReleaseResources.dependsOn generateScratchJrPNGs
     generateFreeDebugResources.dependsOn generateScratchJrPNGs

.idea/misc.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.scratchjr.android">
 
-    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="17" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -36,13 +35,15 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:mimeType="@string/share_mimetype" />
                 <data android:pathPattern="@string/share_extension_filter" />
                 <data android:host="*" />
+                <data android:scheme="file" />
+                <data android:scheme="content" />
             </intent-filter>
         </activity>
 

android/ScratchJr/.idea/caches/build_file_checksums.ser

@@ -13,9 +13,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Base64;
 import android.util.Log;
 import android.view.KeyEvent;

android/ScratchJr/.idea/caches/gradle_models.ser

@@ -28,7 +28,7 @@
  * @author markroth8
  */
 public class SoundRecorderManager {
-    private static final String LOG_TAG = "ScratchJr.SoundRecorderManager";
+    private static final String LOG_TAG = "SoundRecorderManager";
 
     // Recording parameters
     private static final int SAMPLE_RATE_IN_HZ_DEVICE = 22050;

android/ScratchJr/.idea/misc.xml

@@ -6,10 +6,11 @@ buildscript {
             url "https://maven.google.com"
         }
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
-        classpath 'com.google.gms:google-services:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.google.gms:google-services:4.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/ScratchJr/app/build.gradle

@@ -1,6 +1,6 @@
-#Wed Mar 07 11:49:06 EST 2018
+#Mon Sep 09 13:26:20 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip