From 68dbd14ebf756b4919e336cdd5b73d42cd203bcc Mon Sep 17 00:00:00 2001 From: Justin Broughton Date: Fri, 4 Oct 2019 07:57:37 -0700 Subject: [PATCH 1/2] Update references to test loops to be game loops --- app/src/main/res/values/strings.xml | 12 ++++++------ build.gradle | 11 ++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5a91c2..8364706 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,15 +11,15 @@ limitations under the License. --> - Game Test Manager + Game Loop Manager You must accept the storage permission to continue. - Run %d test loop - Run %d test loops + Run %d game loop + Run %d game loops - Run default test loop + Run default game loop Finished executing all scenarios. Timed out while running scenarios. Set timeout @@ -32,6 +32,6 @@ GPU Compatibility Compatibility Performance - Select game test loops - Test Loop Apps + Select game loops + Game Loop Manager diff --git a/build.gradle b/build.gradle index 0448b9c..0f7009d 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,14 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -31,6 +36,10 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } From 7a5f26214b9864e5af362c0708bec06332b7a0d9 Mon Sep 17 00:00:00 2001 From: Justin Broughton Date: Tue, 8 Oct 2019 15:56:28 -0700 Subject: [PATCH 2/2] Update to latest version of build tools. --- app/build.gradle | 10 +++++----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b45bd6..33e20da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.google.samples.apps.gameloopmanager" minSdkVersion 16 @@ -36,10 +36,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:25.3.1' + testImplementation 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index 0f7009d..d10ad1b 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 30664c3..99a116d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 13 11:25:39 GMT 2017 +#Tue Oct 08 15:52:29 PDT 2019 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-5.4.1-all.zip