From 13a6f857fa8b4b26ff462b172097f96d7f638dfa Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 2 May 2023 23:53:04 +0100 Subject: [PATCH 1/6] Change JAVA_HOME path to use JDK 17 from prebuilts repo Change-Id: I91933628d32de2a703c4a6955827044533dd7cdd --- build_android_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_android_release.sh b/build_android_release.sh index c7e5fc835..3817d4cda 100755 --- a/build_android_release.sh +++ b/build_android_release.sh @@ -21,7 +21,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" APP_OUT=$DIR/app/build/outputs -export JAVA_HOME="$(cd $DIR/../../../prebuilts/studio/jdk/jdk11/linux && pwd )" +export JAVA_HOME="$(cd $DIR/../nowinandroid-prebuilts/jdk17/linux && pwd )" echo "JAVA_HOME=$JAVA_HOME" export ANDROID_HOME="$(cd $DIR/../../../prebuilts/fullsdk/linux && pwd )" From 8c9f656eec0ecfa31b6c695416964b4e928aeccc Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 4 May 2023 12:04:46 +0100 Subject: [PATCH 2/6] Add path to JDK 17 Change-Id: If6fd6fab4517242f7bad9149ae2fdbdbbca7ef34 --- kokoro/build.sh | 5 ++++- kokoro/continuous.cfg | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kokoro/build.sh b/kokoro/build.sh index c217e995c..456752516 100755 --- a/kokoro/build.sh +++ b/kokoro/build.sh @@ -36,7 +36,10 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses cd $KOKORO_ARTIFACTS_DIR/git/nowinandroid # The build needs Java 17, set it as the default Java version. -sudo update-java-alternatives --set java-1.17.0-openjdk-amd64 +sudo apt-get update +sudo apt-get install -y openjdk-17-jdk +sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java +java -version # Also clear JAVA_HOME variable so java -version is used instead export JAVA_HOME= diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg index e0db4f172..b7f4c4ac8 100644 --- a/kokoro/continuous.cfg +++ b/kokoro/continuous.cfg @@ -1,2 +1,4 @@ # Location of the bash script. -build_file: "nowinandroid/kokoro/build.sh" \ No newline at end of file +build_file: "nowinandroid/kokoro/build.sh" + +gfile_resources: "/x20/projects/java-platform/linux-amd64/jdk-17-latest" \ No newline at end of file From db5198f08546fa53c9996c091085a6ac17b4fe31 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 4 May 2023 15:49:06 +0100 Subject: [PATCH 3/6] Remove path to JDK 17 (this is installed using apt instead) Change-Id: I6650999f5f750366d2c7277614e26cbb05828b98 --- kokoro/continuous.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg index b7f4c4ac8..e0db4f172 100644 --- a/kokoro/continuous.cfg +++ b/kokoro/continuous.cfg @@ -1,4 +1,2 @@ # Location of the bash script. -build_file: "nowinandroid/kokoro/build.sh" - -gfile_resources: "/x20/projects/java-platform/linux-amd64/jdk-17-latest" \ No newline at end of file +build_file: "nowinandroid/kokoro/build.sh" \ No newline at end of file From 0829cb73f732c65e45a048497a062eaaad2b6ae6 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 9 May 2023 17:05:59 +0100 Subject: [PATCH 4/6] Bump version name to 0.1.0 (versionCode 6) Change-Id: I880683a37b4324f91499eeb47b418ab5e2d1242b --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e172ed8bb..00568cce7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,8 +28,8 @@ plugins { android { defaultConfig { applicationId = "com.google.samples.apps.nowinandroid" - versionCode = 5 - versionName = "0.0.5" // X.Y.Z; X = Major, Y = minor, Z = Patch level + versionCode = 6 + versionName = "0.1.0" // X.Y.Z; X = Major, Y = minor, Z = Patch level // Custom test runner to set up Hilt dependency graph testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner" From 14e53e2bb7e1ba7b60f304d0712023e1788fe011 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Fri, 7 Jul 2023 14:48:35 +0100 Subject: [PATCH 5/6] Remove problematic API 23 device from FTL tests Change-Id: I85b3979ffda637d558f071ac10663f5578f85db7 --- kokoro/nightly.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kokoro/nightly.sh b/kokoro/nightly.sh index 94946020e..1423f4f44 100755 --- a/kokoro/nightly.sh +++ b/kokoro/nightly.sh @@ -21,12 +21,11 @@ set -e set -x # Run the normal build, but replace the default virtual devices with physical ones. -# hammerhead | Nexus 5 | API 23 | Phone # walleye | Pixel 2 | API 27 | Phone # gts4lltevzw | Galaxy Tab S4 | API 28 | Tablet # a10 | Samsung A10 | API 29 | Phone # redfin | Pixel 5e | API 30 | Phone # oriole | Pixel 6 | API 31 | Phone -bash $KOKORO_ARTIFACTS_DIR/git/nowinandroid/kokoro/build.sh "hammerhead,walleye,gts4lltevzw,a10,redfin,oriole" "23,27,28,29,30,31" +bash $KOKORO_ARTIFACTS_DIR/git/nowinandroid/kokoro/build.sh "walleye,gts4lltevzw,a10,redfin,oriole" "27,28,29,30,31" exit $? From 7f62b725a6e3cb0a607af62d06ea6583b463912b Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 13 Jul 2023 11:34:45 +0100 Subject: [PATCH 6/6] Bump version to code=7, name=0.1.1 Change-Id: I2d8fa940dc5e4c14e3c9df650bc1f1432a330f02 --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1a1450258..c3c0aca4f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,8 +29,8 @@ plugins { android { defaultConfig { applicationId = "com.google.samples.apps.nowinandroid" - versionCode = 6 - versionName = "0.1.0" // X.Y.Z; X = Major, Y = minor, Z = Patch level + versionCode = 7 + versionName = "0.1.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level // Custom test runner to set up Hilt dependency graph testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"