diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle b/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/framework/uiauto/app/build.gradle b/wa/framework/uiauto/app/build.gradle
index 2dea31e3..e30ae8f6 100644
--- a/wa/framework/uiauto/app/build.gradle
+++ b/wa/framework/uiauto/app/build.gradle
@@ -11,8 +11,8 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
}
diff --git a/wa/framework/uiauto/build.gradle b/wa/framework/uiauto/build.gradle
index 8a173256..72cd50fc 100644
--- a/wa/framework/uiauto/build.gradle
+++ b/wa/framework/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/wa/framework/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/framework/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/framework/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/framework/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/framework/uiauto/uiauto.aar b/wa/framework/uiauto/uiauto.aar
index 19c8cca4..4adf44db 100644
Binary files a/wa/framework/uiauto/uiauto.aar and b/wa/framework/uiauto/uiauto.aar differ
diff --git a/wa/workloads/adobereader/com.arm.wa.uiauto.adobereader.apk b/wa/workloads/adobereader/com.arm.wa.uiauto.adobereader.apk
index 8bb07539..fd5f4e30 100644
Binary files a/wa/workloads/adobereader/com.arm.wa.uiauto.adobereader.apk and b/wa/workloads/adobereader/com.arm.wa.uiauto.adobereader.apk differ
diff --git a/wa/workloads/adobereader/uiauto/app/build.gradle b/wa/workloads/adobereader/uiauto/app/build.gradle
index 2284e68e..71f25187 100644
--- a/wa/workloads/adobereader/uiauto/app/build.gradle
+++ b/wa/workloads/adobereader/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext: 'aar')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext: 'aar')
}
repositories {
diff --git a/wa/workloads/adobereader/uiauto/build.gradle b/wa/workloads/adobereader/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/adobereader/uiauto/build.gradle
+++ b/wa/workloads/adobereader/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/adobereader/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/adobereader/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/adobereader/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/adobereader/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/aitutu/com.arm.wa.uiauto.aitutu.apk b/wa/workloads/aitutu/com.arm.wa.uiauto.aitutu.apk
index 09305863..0b2cf32a 100644
Binary files a/wa/workloads/aitutu/com.arm.wa.uiauto.aitutu.apk and b/wa/workloads/aitutu/com.arm.wa.uiauto.aitutu.apk differ
diff --git a/wa/workloads/aitutu/uiauto/app/build.gradle b/wa/workloads/aitutu/uiauto/app/build.gradle
index 3e21695c..b0eb2562 100644
--- a/wa/workloads/aitutu/uiauto/app/build.gradle
+++ b/wa/workloads/aitutu/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext: 'aar')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext: 'aar')
}
repositories {
diff --git a/wa/workloads/aitutu/uiauto/build.gradle b/wa/workloads/aitutu/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/aitutu/uiauto/build.gradle
+++ b/wa/workloads/aitutu/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/aitutu/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/aitutu/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/aitutu/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/aitutu/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk
index 19fb8c0b..4e8a7dff 100644
Binary files a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk and b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk differ
diff --git a/wa/workloads/androbench/uiauto/app/build.gradle b/wa/workloads/androbench/uiauto/app/build.gradle
index 57370ce9..36526ccf 100644
--- a/wa/workloads/androbench/uiauto/app/build.gradle
+++ b/wa/workloads/androbench/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext: 'aar')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext: 'aar')
}
repositories {
diff --git a/wa/workloads/androbench/uiauto/build.gradle b/wa/workloads/androbench/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/androbench/uiauto/build.gradle
+++ b/wa/workloads/androbench/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/androbench/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/androbench/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/androbench/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/androbench/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk b/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk
index 29931de2..bb772edb 100644
Binary files a/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk and b/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk differ
diff --git a/wa/workloads/antutu/uiauto/app/build.gradle b/wa/workloads/antutu/uiauto/app/build.gradle
index 21ba665c..aa6ab141 100755
--- a/wa/workloads/antutu/uiauto/app/build.gradle
+++ b/wa/workloads/antutu/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/antutu/uiauto/build.gradle b/wa/workloads/antutu/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100755
--- a/wa/workloads/antutu/uiauto/build.gradle
+++ b/wa/workloads/antutu/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties
index a0e3e773..63131be6 100755
--- a/wa/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/applaunch/com.arm.wa.uiauto.applaunch.apk b/wa/workloads/applaunch/com.arm.wa.uiauto.applaunch.apk
index 6e301cd3..6d78f8cc 100644
Binary files a/wa/workloads/applaunch/com.arm.wa.uiauto.applaunch.apk and b/wa/workloads/applaunch/com.arm.wa.uiauto.applaunch.apk differ
diff --git a/wa/workloads/applaunch/uiauto/app/build.gradle b/wa/workloads/applaunch/uiauto/app/build.gradle
index c6ce7dc8..82f25442 100644
--- a/wa/workloads/applaunch/uiauto/app/build.gradle
+++ b/wa/workloads/applaunch/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/applaunch/uiauto/build.gradle b/wa/workloads/applaunch/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/applaunch/uiauto/build.gradle
+++ b/wa/workloads/applaunch/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/applaunch/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/applaunch/uiauto/gradle/wrapper/gradle-wrapper.properties
index 82ab7f47..4acb4f9c 100644
--- a/wa/workloads/applaunch/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/applaunch/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk
index bcbd3e3f..9d96a2b7 100644
Binary files a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk and b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk differ
diff --git a/wa/workloads/benchmarkpi/uiauto/app/build.gradle b/wa/workloads/benchmarkpi/uiauto/app/build.gradle
index 4f818871..f577546b 100644
--- a/wa/workloads/benchmarkpi/uiauto/app/build.gradle
+++ b/wa/workloads/benchmarkpi/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/benchmarkpi/uiauto/build.gradle b/wa/workloads/benchmarkpi/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/benchmarkpi/uiauto/build.gradle
+++ b/wa/workloads/benchmarkpi/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/benchmarkpi/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/benchmarkpi/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..9b39ed5e 100644
--- a/wa/workloads/benchmarkpi/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/benchmarkpi/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+
diff --git a/wa/workloads/chrome/com.arm.wa.uiauto.chrome.apk b/wa/workloads/chrome/com.arm.wa.uiauto.chrome.apk
index 3000218c..e9910a74 100644
Binary files a/wa/workloads/chrome/com.arm.wa.uiauto.chrome.apk and b/wa/workloads/chrome/com.arm.wa.uiauto.chrome.apk differ
diff --git a/wa/workloads/chrome/uiauto/app/build.gradle b/wa/workloads/chrome/uiauto/app/build.gradle
index 91a60a40..88ca2b1b 100644
--- a/wa/workloads/chrome/uiauto/app/build.gradle
+++ b/wa/workloads/chrome/uiauto/app/build.gradle
@@ -19,11 +19,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext: 'aar')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext: 'aar')
}
repositories {
diff --git a/wa/workloads/chrome/uiauto/build.gradle b/wa/workloads/chrome/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/chrome/uiauto/build.gradle
+++ b/wa/workloads/chrome/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/chrome/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/chrome/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/chrome/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/chrome/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk
index cb232544..151ae084 100644
Binary files a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk and b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk differ
diff --git a/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk b/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk
index ccc4c371..5ec50734 100755
Binary files a/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk and b/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk differ
diff --git a/wa/workloads/gfxbench/uiauto/app/build.gradle b/wa/workloads/gfxbench/uiauto/app/build.gradle
index 871ea29c..81892213 100755
--- a/wa/workloads/gfxbench/uiauto/app/build.gradle
+++ b/wa/workloads/gfxbench/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/gfxbench/uiauto/build.gradle b/wa/workloads/gfxbench/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100755
--- a/wa/workloads/gfxbench/uiauto/build.gradle
+++ b/wa/workloads/gfxbench/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/gfxbench/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/gfxbench/uiauto/gradle/wrapper/gradle-wrapper.properties
index a0e3e773..63131be6 100755
--- a/wa/workloads/gfxbench/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/gfxbench/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/glbenchmark/com.arm.wa.uiauto.glbenchmark.apk b/wa/workloads/glbenchmark/com.arm.wa.uiauto.glbenchmark.apk
index 392231b3..07543810 100644
Binary files a/wa/workloads/glbenchmark/com.arm.wa.uiauto.glbenchmark.apk and b/wa/workloads/glbenchmark/com.arm.wa.uiauto.glbenchmark.apk differ
diff --git a/wa/workloads/glbenchmark/uiauto/app/build.gradle b/wa/workloads/glbenchmark/uiauto/app/build.gradle
index fd6e77c4..c900b664 100644
--- a/wa/workloads/glbenchmark/uiauto/app/build.gradle
+++ b/wa/workloads/glbenchmark/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/glbenchmark/uiauto/build.gradle b/wa/workloads/glbenchmark/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/glbenchmark/uiauto/build.gradle
+++ b/wa/workloads/glbenchmark/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/glbenchmark/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/glbenchmark/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/glbenchmark/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/glbenchmark/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk
index 91d4e08b..d3b78f0e 100644
Binary files a/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk and b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk differ
diff --git a/wa/workloads/gmail/uiauto/app/build.gradle b/wa/workloads/gmail/uiauto/app/build.gradle
index ae7950a2..00150b4c 100644
--- a/wa/workloads/gmail/uiauto/app/build.gradle
+++ b/wa/workloads/gmail/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/gmail/uiauto/build.gradle b/wa/workloads/gmail/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/gmail/uiauto/build.gradle
+++ b/wa/workloads/gmail/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/googlemaps/com.arm.wa.uiauto.googlemaps.apk b/wa/workloads/googlemaps/com.arm.wa.uiauto.googlemaps.apk
index 0c3941e5..4b5a2ee4 100644
Binary files a/wa/workloads/googlemaps/com.arm.wa.uiauto.googlemaps.apk and b/wa/workloads/googlemaps/com.arm.wa.uiauto.googlemaps.apk differ
diff --git a/wa/workloads/googlemaps/uiauto/app/build.gradle b/wa/workloads/googlemaps/uiauto/app/build.gradle
index 800de9da..b830bf0b 100644
--- a/wa/workloads/googlemaps/uiauto/app/build.gradle
+++ b/wa/workloads/googlemaps/uiauto/app/build.gradle
@@ -19,11 +19,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext: 'aar')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext: 'aar')
}
repositories {
diff --git a/wa/workloads/googlemaps/uiauto/build.gradle b/wa/workloads/googlemaps/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/googlemaps/uiauto/build.gradle
+++ b/wa/workloads/googlemaps/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/googlemaps/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/googlemaps/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/googlemaps/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/googlemaps/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk b/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk
index d05e9490..e411de30 100644
Binary files a/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk and b/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk differ
diff --git a/wa/workloads/googlephotos/uiauto/app/build.gradle b/wa/workloads/googlephotos/uiauto/app/build.gradle
index 67400b3c..3a7a1d3a 100644
--- a/wa/workloads/googlephotos/uiauto/app/build.gradle
+++ b/wa/workloads/googlephotos/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/googlephotos/uiauto/build.gradle b/wa/workloads/googlephotos/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/googlephotos/uiauto/build.gradle
+++ b/wa/workloads/googlephotos/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/googlephotos/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/googlephotos/uiauto/gradle/wrapper/gradle-wrapper.properties
index a0e3e773..63131be6 100644
--- a/wa/workloads/googlephotos/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/googlephotos/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/googleplaybooks/com.arm.wa.uiauto.googleplaybooks.apk b/wa/workloads/googleplaybooks/com.arm.wa.uiauto.googleplaybooks.apk
index 42a633a8..88770710 100644
Binary files a/wa/workloads/googleplaybooks/com.arm.wa.uiauto.googleplaybooks.apk and b/wa/workloads/googleplaybooks/com.arm.wa.uiauto.googleplaybooks.apk differ
diff --git a/wa/workloads/googleplaybooks/uiauto/app/build.gradle b/wa/workloads/googleplaybooks/uiauto/app/build.gradle
index f6f49183..a4ff11f0 100644
--- a/wa/workloads/googleplaybooks/uiauto/app/build.gradle
+++ b/wa/workloads/googleplaybooks/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/googleplaybooks/uiauto/build.gradle b/wa/workloads/googleplaybooks/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/googleplaybooks/uiauto/build.gradle
+++ b/wa/workloads/googleplaybooks/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/googleplaybooks/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/googleplaybooks/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/googleplaybooks/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/googleplaybooks/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/googleslides/com.arm.wa.uiauto.googleslides.apk b/wa/workloads/googleslides/com.arm.wa.uiauto.googleslides.apk
index 1388a72d..9b3b0af8 100644
Binary files a/wa/workloads/googleslides/com.arm.wa.uiauto.googleslides.apk and b/wa/workloads/googleslides/com.arm.wa.uiauto.googleslides.apk differ
diff --git a/wa/workloads/googleslides/uiauto/app/build.gradle b/wa/workloads/googleslides/uiauto/app/build.gradle
index 1b04f7be..9a1c0c23 100644
--- a/wa/workloads/googleslides/uiauto/app/build.gradle
+++ b/wa/workloads/googleslides/uiauto/app/build.gradle
@@ -21,12 +21,12 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
// Using older version of uitautomator as the latest version can't find canvas elements.
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
- compile(name: 'uiauto', ext:'aar')
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/googleslides/uiauto/build.gradle b/wa/workloads/googleslides/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/googleslides/uiauto/build.gradle
+++ b/wa/workloads/googleslides/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/googleslides/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/googleslides/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/googleslides/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/googleslides/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/motionmark/com.arm.wa.uiauto.motionmark.apk b/wa/workloads/motionmark/com.arm.wa.uiauto.motionmark.apk
index 76dec1ab..2827cf8a 100644
Binary files a/wa/workloads/motionmark/com.arm.wa.uiauto.motionmark.apk and b/wa/workloads/motionmark/com.arm.wa.uiauto.motionmark.apk differ
diff --git a/wa/workloads/motionmark/uiauto/app/build.gradle b/wa/workloads/motionmark/uiauto/app/build.gradle
index 2648c079..200eb9a4 100644
--- a/wa/workloads/motionmark/uiauto/app/build.gradle
+++ b/wa/workloads/motionmark/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/motionmark/uiauto/build.gradle b/wa/workloads/motionmark/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/motionmark/uiauto/build.gradle
+++ b/wa/workloads/motionmark/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/motionmark/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/motionmark/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/motionmark/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/motionmark/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk
index cbf7b8ee..5664329d 100644
Binary files a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk and b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk differ
diff --git a/wa/workloads/pcmark/uiauto/app/build.gradle b/wa/workloads/pcmark/uiauto/app/build.gradle
index c82a2f28..06c3941c 100755
--- a/wa/workloads/pcmark/uiauto/app/build.gradle
+++ b/wa/workloads/pcmark/uiauto/app/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/pcmark/uiauto/build.gradle b/wa/workloads/pcmark/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100755
--- a/wa/workloads/pcmark/uiauto/build.gradle
+++ b/wa/workloads/pcmark/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/pcmark/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/pcmark/uiauto/gradle/wrapper/gradle-wrapper.properties
index a0e3e773..63131be6 100755
--- a/wa/workloads/pcmark/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/pcmark/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk b/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk
index c01e2e03..8e7bf93b 100644
Binary files a/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk and b/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk differ
diff --git a/wa/workloads/vellamo/uiauto/app/build.gradle b/wa/workloads/vellamo/uiauto/app/build.gradle
index e961f2f9..c2566f65 100644
--- a/wa/workloads/vellamo/uiauto/app/build.gradle
+++ b/wa/workloads/vellamo/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/vellamo/uiauto/build.gradle b/wa/workloads/vellamo/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/vellamo/uiauto/build.gradle
+++ b/wa/workloads/vellamo/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/wa/workloads/youtube/com.arm.wa.uiauto.youtube.apk b/wa/workloads/youtube/com.arm.wa.uiauto.youtube.apk
index e7cfea8e..c74928c4 100644
Binary files a/wa/workloads/youtube/com.arm.wa.uiauto.youtube.apk and b/wa/workloads/youtube/com.arm.wa.uiauto.youtube.apk differ
diff --git a/wa/workloads/youtube/uiauto/app/build.gradle b/wa/workloads/youtube/uiauto/app/build.gradle
index e0a24745..1cadcf67 100644
--- a/wa/workloads/youtube/uiauto/app/build.gradle
+++ b/wa/workloads/youtube/uiauto/app/build.gradle
@@ -21,11 +21,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support.test:runner:0.5'
- compile 'com.android.support.test:rules:0.5'
- compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
- compile(name: 'uiauto', ext:'aar')
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support.test:runner:0.5'
+ implementation 'com.android.support.test:rules:0.5'
+ implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ implementation(name: 'uiauto', ext:'aar')
}
repositories {
diff --git a/wa/workloads/youtube/uiauto/build.gradle b/wa/workloads/youtube/uiauto/build.gradle
index d0ddbb37..a40e2d1b 100644
--- a/wa/workloads/youtube/uiauto/build.gradle
+++ b/wa/workloads/youtube/uiauto/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/wa/workloads/youtube/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/youtube/uiauto/gradle/wrapper/gradle-wrapper.properties
index 715cc879..31129642 100644
--- a/wa/workloads/youtube/uiauto/gradle/wrapper/gradle-wrapper.properties
+++ b/wa/workloads/youtube/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip