updated build for new gradle wrapper and plugin [sdk-60]

Author: Martin Bella

build.gradle

@@ -26,11 +26,12 @@ buildscript {
 
     repositories {
         jcenter()
+        google()
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
         classpath 'gradle.plugin.com.nimbledroid:gradle-profiler:1.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
@@ -40,7 +41,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        mavenLocal()
+        google()
     }
 }
 
@@ -64,7 +65,7 @@ subprojects {
 
     android {
         compileSdkVersion 25
-        buildToolsVersion '25.0.3'
+        buildToolsVersion '26.0.0'
 
         defaultConfig {
             minSdkVersion 15
@@ -83,8 +84,8 @@ subprojects {
         }
 
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
         }
 
         if (isLibrary) {
@@ -106,16 +107,17 @@ subprojects {
 
     if (isLibrary) {
         dependencies {
-            testCompile 'com.google.truth:truth:0.33'
-            testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
-            testCompile 'com.squareup.okhttp:mockwebserver:2.7.5'
-            testCompile 'junit:junit:4.12'
-            testCompile 'nl.jqno.equalsverifier:equalsverifier:2.3'
-            testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-            testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-            testCompile 'org.json:json:20170516'
-            testCompile 'org.mockito:mockito-core:2.8.47'
-            testCompile 'org.robolectric:robolectric:3.3.2'
+            testImplementation 'com.google.truth:truth:0.33'
+            testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
+            testImplementation 'com.squareup.okhttp:mockwebserver:2.7.5'
+            testImplementation 'junit:junit:4.12'
+            testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.3'
+            testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+            testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+            testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
+            testImplementation 'org.json:json:20170516'
+            testImplementation 'org.mockito:mockito-core:2.8.47'
+            testImplementation 'org.robolectric:robolectric:3.3.2'
         }
     }
 
@@ -131,7 +133,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
+    gradleVersion = '4.0'
 }
 
 task clean(type: Delete) {

examples/demo/build.gradle

@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-    compile project(':library')
+    implementation project(':library')
 
-    compile "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
 }

examples/notifications-style/build.gradle

@@ -44,8 +44,8 @@ android {
 }
 
 dependencies {
-    compile project(':library')
-    compile project(':library-notifications')
+    implementation project(':library')
+    implementation project(':library-notifications')
 
-    compile "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
 }

examples/notifications-style/src/main/java/com/deltadna/android/sdk/notifications/example/ExampleActivity.java

@@ -24,7 +24,6 @@
 
 import com.deltadna.android.sdk.DDNA;
 import com.deltadna.android.sdk.notifications.DDNANotifications;
-import com.google.firebase.iid.FirebaseInstanceId;
 
 public class ExampleActivity extends AppCompatActivity {
 

examples/notifications/build.gradle

@@ -44,8 +44,8 @@ android {
 }
 
 dependencies {
-    compile project(':library')
-    compile project(':library-notifications')
+    implementation project(':library')
+    implementation project(':library-notifications')
 
-    compile "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
 }

gradle.properties

@@ -14,3 +14,5 @@ POM_LICENCE_DIST=repo
 
 RELEASE_REPOSITORY_URL=https://api.bintray.com/maven/deltadna/android/deltadna-sdk/;publish=1
 SNAPSHOT_REPOSITORY_URL=http://edinlin01:8082/artifactory/libs-snapshot-local
+
+org.gradle.jvmargs=-Xmx1536M

gradle/mvn-push.gradle

@@ -77,7 +77,7 @@ afterEvaluate { project ->
                     licenses {
                         license {
                             name POM_LICENCE_NAME
-                            url POM_LICENCE_URL
+                            url POM_LICENCE_URL 
                             distribution POM_LICENCE_DIST
                         }
                     }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Jan 24 10:15:41 GMT 2017
+#Tue Jun 20 10:35:43 BST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -17,8 +17,8 @@
 android {}
 
 dependencies {
-    compile "com.android.support:support-annotations:$supportVersion"
-    compile "com.google.firebase:firebase-messaging:$firebaseVersion"
+    api "com.android.support:support-annotations:$supportVersion"
+    api "com.google.firebase:firebase-messaging:$firebaseVersion"
 
-    provided project(':library')
+    compileOnly project(':library')
 }

library-notifications/build.gradle

@@ -17,5 +17,5 @@
 android {}
 
 dependencies {
-    compile "com.android.support:support-annotations:$supportVersion"
+    api "com.android.support:support-annotations:$supportVersion"
 }