From 5834c5bf00f63e0ced20081ea9476503c5d08245 Mon Sep 17 00:00:00 2001 From: Manuel Vivo Date: Thu, 7 Nov 2019 13:18:32 +0100 Subject: [PATCH 1/8] Updates libraries --- constraint-layout-start/app/build.gradle | 13 +++++++------ constraint-layout-start/build.gradle | 9 +++++++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/constraint-layout-start/app/build.gradle b/constraint-layout-start/app/build.gradle index 8ebca8c..01a7d7f 100644 --- a/constraint-layout-start/app/build.gradle +++ b/constraint-layout-start/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.google.googleio" minSdkVersion 22 - targetSdkVersion 25 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -19,7 +19,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support.constraint:constraint-layout:1.1.0-beta1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + + implementation 'com.android.support.constraint:constraint-layout:1.1.3' } diff --git a/constraint-layout-start/build.gradle b/constraint-layout-start/build.gradle index 7dfba33..f59c36d 100644 --- a/constraint-layout-start/build.gradle +++ b/constraint-layout-start/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,7 +20,8 @@ allprojects { repositories { jcenter() maven { - url 'https://maven.google.com' + url 'https://maven.google.com/' + name 'Google' } } } diff --git a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties index 1b50332..70ee5c7 100644 --- a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties +++ b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 03 10:22:23 PDT 2017 +#Thu Nov 07 12:41:13 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From a0ad9796b5306c272e13f6082049ab281aa2c348 Mon Sep 17 00:00:00 2001 From: Sean McQuillan Date: Wed, 25 Mar 2020 15:01:03 -0700 Subject: [PATCH 2/8] Fix content description and clickability of image fab. --- .../app/src/main/res/layout/activity_main_barriers.xml | 4 +++- .../app/src/main/res/layout/activity_main_chains.xml | 4 +++- .../app/src/main/res/layout/activity_main_done.xml | 4 +++- .../app/src/main/res/layout/activity_main_inference.xml | 4 +++- .../app/src/main/res/values-de/strings.xml | 1 + constraint-layout-start/app/src/main/res/values/strings.xml | 3 ++- constraint-layout-start/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml b/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml index 74ccd6c..26bf773 100644 --- a/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml +++ b/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml @@ -44,7 +44,9 @@ android:layout_marginBottom="16dp" android:layout_marginEnd="16dp" android:background="@drawable/info_background" - android:contentDescription="@string/placeholder" + android:contentDescription="@string/fab_content_description" + android:clickable="true" + android:focusable="true" android:padding="5dp" android:src="@drawable/ic_star" app:layout_constraintBottom_creator="0" diff --git a/constraint-layout-start/app/src/main/res/layout/activity_main_chains.xml b/constraint-layout-start/app/src/main/res/layout/activity_main_chains.xml index 9f0a747..6f43e20 100644 --- a/constraint-layout-start/app/src/main/res/layout/activity_main_chains.xml +++ b/constraint-layout-start/app/src/main/res/layout/activity_main_chains.xml @@ -47,7 +47,9 @@ android:id="@+id/favorite" android:background="@drawable/info_background" android:padding="5dp" - android:contentDescription="@string/placeholder" + android:contentDescription="@string/fab_content_description" + android:clickable="true" + android:focusable="true" app:layout_constraintTop_creator="1" app:layout_constraintRight_creator="1" app:layout_constraintBottom_creator="0" diff --git a/constraint-layout-start/app/src/main/res/layout/activity_main_done.xml b/constraint-layout-start/app/src/main/res/layout/activity_main_done.xml index bc4a47e..56a839d 100644 --- a/constraint-layout-start/app/src/main/res/layout/activity_main_done.xml +++ b/constraint-layout-start/app/src/main/res/layout/activity_main_done.xml @@ -47,7 +47,9 @@ android:id="@+id/favorite" android:background="@drawable/info_background" android:padding="5dp" - android:contentDescription="@string/placeholder" + android:contentDescription="@string/fab_content_description" + android:clickable="true" + android:focusable="true" app:layout_constraintTop_creator="1" app:layout_constraintRight_creator="1" app:layout_constraintBottom_creator="0" diff --git a/constraint-layout-start/app/src/main/res/layout/activity_main_inference.xml b/constraint-layout-start/app/src/main/res/layout/activity_main_inference.xml index f477640..11f68e6 100644 --- a/constraint-layout-start/app/src/main/res/layout/activity_main_inference.xml +++ b/constraint-layout-start/app/src/main/res/layout/activity_main_inference.xml @@ -45,7 +45,9 @@ android:id="@+id/favorite" android:background="@drawable/info_background" android:padding="5dp" - android:contentDescription="@string/placeholder" + android:contentDescription="@string/fab_content_description" + android:clickable="true" + android:focusable="true" app:layout_constraintTop_creator="1" app:layout_constraintRight_creator="1" app:layout_constraintBottom_creator="0" diff --git a/constraint-layout-start/app/src/main/res/values-de/strings.xml b/constraint-layout-start/app/src/main/res/values-de/strings.xml index 637db23..c1d9d01 100644 --- a/constraint-layout-start/app/src/main/res/values-de/strings.xml +++ b/constraint-layout-start/app/src/main/res/values-de/strings.xml @@ -10,4 +10,5 @@ Kamera Leica M Typ 240 Singapur + Stern fabelhaft \ No newline at end of file diff --git a/constraint-layout-start/app/src/main/res/values/strings.xml b/constraint-layout-start/app/src/main/res/values/strings.xml index feeda76..cda850d 100644 --- a/constraint-layout-start/app/src/main/res/values/strings.xml +++ b/constraint-layout-start/app/src/main/res/values/strings.xml @@ -17,7 +17,8 @@ Layout Codelab Singapore officially the Republic of Singapore, and often referred to as the Lion City, the Garden City, and the Red Dot, is a global city in Southeast Asia and the world\'s only island city-state. It lies one degree (137 km) north of the equator, at the southernmost tip of continental Asia and peninsular Malaysia, with Indonesia\'s Riau Islands to the south. Singapore\'s territory consists of the diamond-shaped main island and 62 islets. - Placeholders + Placeholder + Star FAB Discard Upload ƒ/4 16s ISO 200 diff --git a/constraint-layout-start/build.gradle b/constraint-layout-start/build.gradle index f59c36d..c5c32a0 100644 --- a/constraint-layout-start/build.gradle +++ b/constraint-layout-start/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.6.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties index 70ee5c7..a372174 100644 --- a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties +++ b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 07 12:41:13 CET 2019 +#Tue Mar 24 15:28:00 PDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip From 671982a5ababf9ca45cfbc225dba46c03d8e5e4b Mon Sep 17 00:00:00 2001 From: Sean McQuillan Date: Wed, 25 Mar 2020 15:33:53 -0700 Subject: [PATCH 3/8] Increase touch targets --- .../app/src/main/res/drawable/info_background.xml | 2 +- .../app/src/main/res/layout/activity_main_barriers.xml | 6 ++++-- .../app/src/main/res/layout/activity_main_chains.xml | 6 ++++-- .../app/src/main/res/layout/activity_main_done.xml | 6 ++++-- .../app/src/main/res/layout/activity_main_inference.xml | 6 ++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/constraint-layout-start/app/src/main/res/drawable/info_background.xml b/constraint-layout-start/app/src/main/res/drawable/info_background.xml index 8706792..7b734c5 100755 --- a/constraint-layout-start/app/src/main/res/drawable/info_background.xml +++ b/constraint-layout-start/app/src/main/res/drawable/info_background.xml @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml b/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml index 26bf773..8bd98d4 100644 --- a/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml +++ b/constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml @@ -39,8 +39,8 @@ Date: Tue, 31 Mar 2020 21:21:44 -0700 Subject: [PATCH 4/8] Add Github Actions (#83) * Add Github Actions * Remove outdated placeholder test * Skip app:lintDebug Skipping app:lintDebug as the the code's starting state contains lint errors that are corrected when implementing the codelab. * Update build_test.yml --- .github/workflows/build_test.yml | 56 +++++++++++++++++++ .../com/google/googleio/ApplicationTest.java | 27 --------- 2 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/build_test.yml delete mode 100644 constraint-layout-start/app/src/androidTest/java/com/google/googleio/ApplicationTest.java diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml new file mode 100644 index 0000000..4751523 --- /dev/null +++ b/.github/workflows/build_test.yml @@ -0,0 +1,56 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + # Build will compile APK, test APK and run tests, lint, etc. + build: + + runs-on: ubuntu-latest + timeout-minutes: 45 + env: + TERM: dumb + + steps: + - uses: actions/checkout@v2 + + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + # Skipping app:lintDebug as the the code's starting state contains lint errors that are + # corrected when implementing the codelab. + - name: Build and check + working-directory: constraint-layout-start + run: ./gradlew assembleDebug assembleDebugAndroidTest testDebug + + - name: Upload build reports + if: always() + uses: actions/upload-artifact@v1 + with: + name: build-reports + path: constraint-layout-start/app/build/reports + + - name: Copy test results + working-directory: constraint-layout-start + if: always() + run: | + mkdir -p junit + find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} junit/ \; + + - name: Upload test results + if: always() + uses: actions/upload-artifact@v1 + with: + name: junit-results + path: constraint-layout-start/junit diff --git a/constraint-layout-start/app/src/androidTest/java/com/google/googleio/ApplicationTest.java b/constraint-layout-start/app/src/androidTest/java/com/google/googleio/ApplicationTest.java deleted file mode 100644 index 55284da..0000000 --- a/constraint-layout-start/app/src/androidTest/java/com/google/googleio/ApplicationTest.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.googleio; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file From ef5a65a9347ce4922963fe26cbc4551746d64671 Mon Sep 17 00:00:00 2001 From: osuleymanova <86437155+osuleymanova@users.noreply.github.com> Date: Wed, 29 Dec 2021 16:26:58 -0800 Subject: [PATCH 5/8] Bumps versions update Target and compile SDK versions updated buildToolsVersion updated Gradle Plugin version updated android:exported="true" in Manifest set libraries versions updated jcenter() replaced with mavenCentral() --- constraint-layout-start/app/build.gradle | 10 +++++----- .../app/src/main/AndroidManifest.xml | 3 ++- constraint-layout-start/build.gradle | 6 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/constraint-layout-start/app/build.gradle b/constraint-layout-start/app/build.gradle index 01a7d7f..388a8a6 100644 --- a/constraint-layout-start/app/build.gradle +++ b/constraint-layout-start/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" + compileSdkVersion 31 + buildToolsVersion "30.0.2" defaultConfig { applicationId "com.google.googleio" minSdkVersion 22 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 versionName "1.0" } @@ -20,7 +20,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' } diff --git a/constraint-layout-start/app/src/main/AndroidManifest.xml b/constraint-layout-start/app/src/main/AndroidManifest.xml index 50ef845..2c99a83 100644 --- a/constraint-layout-start/app/src/main/AndroidManifest.xml +++ b/constraint-layout-start/app/src/main/AndroidManifest.xml @@ -25,7 +25,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="AllowBackup,GoogleAppIndexingWarning"> - + diff --git a/constraint-layout-start/build.gradle b/constraint-layout-start/build.gradle index c5c32a0..71cfba1 100644 --- a/constraint-layout-start/build.gradle +++ b/constraint-layout-start/build.gradle @@ -2,14 +2,14 @@ buildscript { repositories { - jcenter() + mavenCentral() maven { url 'https://maven.google.com/' name 'Google' } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:7.0.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() maven { url 'https://maven.google.com/' name 'Google' diff --git a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties index a372174..092395f 100644 --- a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties +++ b/constraint-layout-start/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-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip From a6c2d2fb8631c4dc68fcbc5097b941452fac55d2 Mon Sep 17 00:00:00 2001 From: osuleymanova <86437155+osuleymanova@users.noreply.github.com> Date: Fri, 11 Feb 2022 11:44:07 -0800 Subject: [PATCH 6/8] AGP and Gradle versions update for Bumblebee AGP and Gradle versions updated compileSDK and targetSDK updated --- constraint-layout-start/app/build.gradle | 5 ++--- constraint-layout-start/build.gradle | 12 +++--------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/constraint-layout-start/app/build.gradle b/constraint-layout-start/app/build.gradle index 388a8a6..0c547f2 100644 --- a/constraint-layout-start/app/build.gradle +++ b/constraint-layout-start/app/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 31 - buildToolsVersion "30.0.2" + compileSdkVersion 32 defaultConfig { applicationId "com.google.googleio" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName "1.0" } diff --git a/constraint-layout-start/build.gradle b/constraint-layout-start/build.gradle index 71cfba1..0ddc48e 100644 --- a/constraint-layout-start/build.gradle +++ b/constraint-layout-start/build.gradle @@ -2,14 +2,11 @@ buildscript { repositories { + google() mavenCentral() - maven { - url 'https://maven.google.com/' - name 'Google' } - } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.1.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,13 +15,10 @@ buildscript { allprojects { repositories { + google() mavenCentral() - maven { - url 'https://maven.google.com/' - name 'Google' } } -} task clean(type: Delete) { delete rootProject.buildDir diff --git a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties b/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties index 092395f..23cdd3c 100644 --- a/constraint-layout-start/gradle/wrapper/gradle-wrapper.properties +++ b/constraint-layout-start/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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip From 7fa201442beebd84d02aa39950623eb9229b5b71 Mon Sep 17 00:00:00 2001 From: osuleymanova <86437155+osuleymanova@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:05:52 -0800 Subject: [PATCH 7/8] gradle.properties update --- constraint-layout-start/gradle.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/constraint-layout-start/gradle.properties b/constraint-layout-start/gradle.properties index 1d3591c..1e0c1d3 100644 --- a/constraint-layout-start/gradle.properties +++ b/constraint-layout-start/gradle.properties @@ -9,8 +9,9 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +android.enableJetifier=true +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit From f432cf335de7f9c4417262fcad3feebac56f84f4 Mon Sep 17 00:00:00 2001 From: osuleymanova <86437155+osuleymanova@users.noreply.github.com> Date: Fri, 11 Feb 2022 14:56:48 -0800 Subject: [PATCH 8/8] Some updates --- .github/workflows/build_test.yml | 4 ++-- constraint-layout-start/gradle.properties | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 4751523..1322c17 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up JDK 1.8 + - name: set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 # Skipping app:lintDebug as the the code's starting state contains lint errors that are # corrected when implementing the codelab. diff --git a/constraint-layout-start/gradle.properties b/constraint-layout-start/gradle.properties index 1e0c1d3..f1c49f3 100644 --- a/constraint-layout-start/gradle.properties +++ b/constraint-layout-start/gradle.properties @@ -9,8 +9,6 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true -android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode.