Merge aedab68 into master-4.0

realm-ci · web-flow · commit 175603dde57d · 2017-08-19T20:37:51.000-07:00
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -24,8 +24,8 @@ allprojects {
         }
         dependencies {
             classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
-            classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-            classpath 'com.novoda:gradle-android-command-plugin:1.5.0'
+            classpath 'com.novoda:gradle-android-command-plugin:1.7.1'
+            classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
             classpath "io.realm:realm-gradle-plugin:${currentVersion}"
         }
     }
diff --git a/examples/encryptionExample/build.gradle b/examples/encryptionExample/build.gradle
@@ -23,6 +23,6 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
diff --git a/examples/gridViewExample/build.gradle b/examples/gridViewExample/build.gradle
@@ -22,7 +22,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 
     splits {
diff --git a/examples/introExample/build.gradle b/examples/introExample/build.gradle
@@ -24,6 +24,6 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
diff --git a/examples/jsonExample/build.gradle b/examples/jsonExample/build.gradle
@@ -23,7 +23,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/examples/kotlinExample/build.gradle b/examples/kotlinExample/build.gradle
@@ -36,7 +36,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 
     sourceSets {
diff --git a/examples/migrationExample/build.gradle b/examples/migrationExample/build.gradle
@@ -19,6 +19,6 @@ android {
         }
     }
     command {
-        events 2000
+        monkey.events 2000
     }
 }
diff --git a/examples/moduleExample/app/build.gradle b/examples/moduleExample/app/build.gradle
@@ -32,7 +32,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/examples/newsreaderExample/build.gradle b/examples/newsreaderExample/build.gradle
@@ -19,7 +19,7 @@ android {
         }
     }
     command {
-        events 2000
+        monkey.events 2000
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/examples/objectServerExample/build.gradle b/examples/objectServerExample/build.gradle
@@ -51,7 +51,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/examples/rxJavaExample/build.gradle b/examples/rxJavaExample/build.gradle
@@ -24,7 +24,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/examples/secureTokenAndroidKeyStore/build.gradle b/examples/secureTokenAndroidKeyStore/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'android-command'
 apply plugin: 'realm-android'
 
 android {
@@ -21,6 +22,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    command {
+        monkey.events 2000
+    }
 }
 
 dependencies {
diff --git a/examples/threadExample/build.gradle b/examples/threadExample/build.gradle
@@ -19,7 +19,7 @@ android {
         }
     }
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/examples/unitTestExample/build.gradle b/examples/unitTestExample/build.gradle
@@ -24,7 +24,7 @@ android {
     }
 
     command {
-        events 2000
+        monkey.events 2000
     }
 }
 
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
diff --git a/realm-annotations/build.gradle b/realm-annotations/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
diff --git a/realm-transformer/build.gradle b/realm-transformer/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
diff --git a/realm/build.gradle b/realm/build.gradle
@@ -10,15 +10,15 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
-        classpath 'de.undercouch:gradle-download-task:3.1.1'
+        classpath 'de.undercouch:gradle-download-task:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.novoda:gradle-android-command-plugin:1.5.0'
-        classpath 'com.github.skhatri:gradle-s3-plugin:1.0.2'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.novoda:gradle-android-command-plugin:1.7.1'
+        classpath 'com.github.skhatri:gradle-s3-plugin:1.0.4'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath "io.realm:realm-transformer:${file('../version.txt').text.trim()}"
-        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.10'
+        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.11'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ allprojects {`
`24`	`24`	`}`
`25`	`25`	`dependencies {`
`26`	`26`	`classpath 'com.android.tools.build:gradle:3.0.0-alpha4'`
`27`		`- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'`
`28`		`- classpath 'com.novoda:gradle-android-command-plugin:1.5.0'`
	`27`	`+ classpath 'com.novoda:gradle-android-command-plugin:1.7.1'`
	`28`	`+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'`
`29`	`29`	`classpath "io.realm:realm-gradle-plugin:${currentVersion}"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ android {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`command {`
`26`		`- events 2000`
	`26`	`+ monkey.events 2000`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`command {`
`25`		`- events 2000`
	`25`	`+ monkey.events 2000`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`splits {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ android {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`command {`
`27`		`- events 2000`
	`27`	`+ monkey.events 2000`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ android {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`command {`
`26`		`- events 2000`
	`26`	`+ monkey.events 2000`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ android {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`command {`
`39`		`- events 2000`
	`39`	`+ monkey.events 2000`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ android {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`command {`
`22`		`- events 2000`
	`22`	`+ monkey.events 2000`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`command {`
`35`		`- events 2000`
	`35`	`+ monkey.events 2000`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ android {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`command {`
`22`		`- events 2000`
	`22`	`+ monkey.events 2000`
`23`	`23`	`}`
`24`	`24`	`lintOptions {`
`25`	`25`	`disable 'InvalidPackage'`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`command {`
`54`		`- events 2000`
	`54`	`+ monkey.events 2000`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`