Master v20.0

Android/3D Cave Runner - Android Studio/app/build.gradle

@@ -1,6 +1,6 @@
 def versionMajor = 4
 def versionMinor = 3
-def versionPatch = 11
+def versionPatch = 12
 def versionBuild = System.getenv('BUILD_NUMBER') ? Integer.parseInt(System.getenv('BUILD_NUMBER')) : 1
 
 buildscript {
@@ -14,9 +14,9 @@ buildscript {
     dependencies {
         // The Fabric Gradle plugin uses an open ended version to react
         // quickly to Android tooling updates
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.0'
-        classpath 'io.fabric.tools:gradle:1.22.0'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1'
+        classpath 'io.fabric.tools:gradle:1.22.1'
+        classpath 'com.google.gms:google-services:3.1.0'
 
     }
 }
@@ -35,8 +35,8 @@ android {
             // make sure to update the .jks file pointing to your machine
         }
     }
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.skillzgames.caverun"
         minSdkVersion 19
@@ -48,6 +48,7 @@ android {
         versionCode versionMajor * 10000000 + versionMinor * 100000 + versionPatch * 1000 + versionBuild
         versionName "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}"
     }
+    flavorDimensions "currency"
     buildTypes {
         release {
             debuggable=false
@@ -72,10 +73,12 @@ android {
     productFlavors {
         main {
             resValue "string", "app_name", "3D Cave Runner"
+            dimension "currency"
         }
         vconly {
             resValue "string", "app_name", "Cave Runner"
             applicationIdSuffix ".vconly"
+            dimension "currency"
         }
     }
     sourceSets {
@@ -94,16 +97,21 @@ android {
     }
 }
 
-
 dependencies {
     compile files('libs/unity-classes.jar')
     //Skillz SDK
 
-    compile 'com.skillz.sdk:skillz-sdk-android:19.0.9-SNAPSHOT'
+    compile 'com.skillz.sdk:skillz-sdk-android:20.0.0-SNAPSHOT'
     compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
         transitive = true
     }
-    compile 'com.google.android.gms:play-services-gcm:11.0.4'
+    compile 'com.google.android.gms:play-services-gcm:11.8.0'
+
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+
 }
 
 repositories {

Android/3D Cave Runner - Android Studio/build.gradle

@@ -1,16 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.google.gms:google-services:3.1.0'
     }
 }
 
 allprojects {
     repositories {
+        google()
+        mavenCentral()
         jcenter()
     }
 }

Android/3D Cave Runner - Android Studio/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Mar 26 15:22:25 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

Android/3D Cave Runner - Android Studio/local.properties

@@ -7,6 +7,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Oct 03 11:47:39 PDT 2017
-ndk.dir=/Users/tjfallon/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/tjfallon/Library/Android/sdk
+#Mon Mar 26 15:59:21 PDT 2018
+ndk.dir=/Users/gherlihy/Library/Android/sdk/ndk-bundle
+sdk.dir=/Users/gherlihy/Library/Android/sdk

bin/build-cave-runner.sh

@@ -11,12 +11,10 @@ printf "apiSecret=bc1e89c576f18f877c98d2ca8a922096ef5415a8b5023e922eb6b2c474a455
 # Link Sidious location for Android SDK
 sudo ln -sf /Users/opsadmin/Library/Android/sdk /usr/local/android-sdk-linux
 # Compile Apps
-# Clean dependencies so latest Skillz SDK is fetched
-./gradlew --refresh-dependencies
 
-# Move theme for VC, and compile
+# Move theme for VC, clean dependencies so latest Skillz SDK is fetched, and compile
 mv "${WORKSPACE}/themes/custom_theme-cr-vc.json" "${WORKSPACE}/Android/3D Cave Runner - Android Studio/app/src/main/assets/custom_theme.json"
-./gradlew clean :app:assembleVconlyRelease :app:crashlyticsUploadDistributionVconlyRelease
+./gradlew --refresh-dependencies clean :app:assembleVconlyRelease :app:crashlyticsUploadDistributionVconlyRelease
 
 # Move theme for Full, and compile
 mv "${WORKSPACE}/themes/custom_theme-cr-full.json" "${WORKSPACE}/Android/3D Cave Runner - Android Studio/app/src/main/assets/custom_theme.json"