aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAng Li <angli@google.com>2018-06-01 02:46:57 -0700
committerGitHub <noreply@github.com>2018-06-01 02:46:57 -0700
commit56a86a043b8ed30b86eb6a1f0d3cd56423cb6e31 (patch)
treedfaacc5a48588350e4b17c594150cb79923f26b8
parent035c2b1332743d8d7c6a9087ab69d5bcef3cd5bb (diff)
downloadmobly-snippet-lib-56a86a043b8ed30b86eb6a1f0d3cd56423cb6e31.tar.gz
Update gradle and project deps. (#94)
-rw-r--r--build.gradle2
-rw-r--r--examples/ex1_standalone_app/README.md4
-rw-r--r--examples/ex2_espresso/build.gradle12
-rw-r--r--examples/ex4_uiautomator/build.gradle2
-rw-r--r--examples/ex5_schedule_rpc/build.gradle2
-rw-r--r--examples/ex6_complex_type_conversion/build.gradle2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--third_party/sl4a/build.gradle4
8 files changed, 16 insertions, 16 deletions
diff --git a/build.gradle b/build.gradle
index 21ab790..2d60450 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/examples/ex1_standalone_app/README.md b/examples/ex1_standalone_app/README.md
index a7ecaa8..d62f9fc 100644
--- a/examples/ex1_standalone_app/README.md
+++ b/examples/ex1_standalone_app/README.md
@@ -2,7 +2,7 @@
This tutorial shows you how to create a standalone Mobly snippet app. To create
a snippet app that controls (instruments) another app under test, please see
-(Example 2](../ex2_espresso/README.md).
+[Example 2](../ex2_espresso/README.md).
## Tutorial
@@ -25,7 +25,7 @@ a snippet app that controls (instruments) another app under test, please see
public class ExampleSnippet implements Snippet {
@Rpc(description='Returns a string containing the given number.')
public String getFoo(Integer input) {
- return 'foo ' + input;
+ return "foo " + input;
}
@Override
diff --git a/examples/ex2_espresso/build.gradle b/examples/ex2_espresso/build.gradle
index 1cf1745..845eeff 100644
--- a/examples/ex2_espresso/build.gradle
+++ b/examples/ex2_espresso/build.gradle
@@ -32,14 +32,14 @@ android {
dependencies {
implementation 'com.android.support:appcompat-v7:26.1.0'
- implementation 'com.android.support.test:runner:1.0.1'
+ implementation 'com.android.support.test:runner:1.0.2'
// The androidTest package is not for snippet support; it shows an example
// of an instrumentation test coexisting with a snippet in the same
// codebase.
- androidTestImplementation 'com.android.support:support-annotations:26.1.0'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test:rules:1.0.1'
+ androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
exclude group: 'com.android.support', module: 'support-annotations'
})
@@ -50,6 +50,6 @@ dependencies {
//snippetCompile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
snippetImplementation project(':mobly-snippet-lib')
- snippetImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
- snippetImplementation 'com.android.support:support-annotations:26.1.0'
+ snippetImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ snippetImplementation 'com.android.support:support-annotations:27.1.1'
}
diff --git a/examples/ex4_uiautomator/build.gradle b/examples/ex4_uiautomator/build.gradle
index 8a7ebb4..47b3526 100644
--- a/examples/ex4_uiautomator/build.gradle
+++ b/examples/ex4_uiautomator/build.gradle
@@ -25,7 +25,7 @@ dependencies {
//compile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
implementation project(':mobly-snippet-lib')
implementation 'junit:junit:4.12'
- implementation 'com.android.support.test:runner:1.0.1'
+ implementation 'com.android.support.test:runner:1.0.2'
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
}
diff --git a/examples/ex5_schedule_rpc/build.gradle b/examples/ex5_schedule_rpc/build.gradle
index 905632a..6424e44 100644
--- a/examples/ex5_schedule_rpc/build.gradle
+++ b/examples/ex5_schedule_rpc/build.gradle
@@ -23,5 +23,5 @@ dependencies {
// this repo. For your own snippets, you'll want to use the regular 'compile' dep instead:
// compile 'com.google.android.mobly:mobly-snippet-lib:1.3.0'
implementation project(':mobly-snippet-lib')
- implementation 'com.android.support.test:runner:1.0.1'
+ implementation 'com.android.support.test:runner:1.0.2'
}
diff --git a/examples/ex6_complex_type_conversion/build.gradle b/examples/ex6_complex_type_conversion/build.gradle
index f0c2ae7..aa71705 100644
--- a/examples/ex6_complex_type_conversion/build.gradle
+++ b/examples/ex6_complex_type_conversion/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
- buildToolsVersion '26.0.2'
+ buildToolsVersion '27.0.3'
defaultConfig {
applicationId "com.google.android.mobly.snippet.example6"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 06228b6..649f440 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 04 16:01:04 PDT 2017
+#Mon May 21 15:30:28 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/third_party/sl4a/build.gradle b/third_party/sl4a/build.gradle
index 46c3797..24fafc0 100644
--- a/third_party/sl4a/build.gradle
+++ b/third_party/sl4a/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
@@ -62,7 +62,7 @@ dependencies {
// implementation fileTree(include: ['*.jar'], dir: 'libs')
// implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'junit:junit:4.12'
- implementation 'com.android.support.test:runner:1.0.1'
+ implementation 'com.android.support.test:runner:1.0.2'
}
googleJavaFormat {