From 186df4f649ff9acfbe195d0bf8ed8449951e783f Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 9 Mar 2021 23:21:28 -0500 Subject: [PATCH 01/18] update Android gradle plugin, build tools and SDK --- build.gradle | 4 ++-- shared.gradle | 2 +- .../accessibility/talkback/gesture/GestureHistory.java | 2 +- .../accessibility/talkback/labeling/CustomLabelManager.java | 2 +- .../talkback/labeling/LabelManagerSummaryActivity.java | 2 +- .../accessibility/talkback/labeling/LabelProvider.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 119760597..b99c8ebd2 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } dependencies { classpath 'org.aspectj:aspectjtools:1.8.1' - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -29,7 +29,7 @@ allprojects { } android { - buildToolsVersion '29.0.0' + buildToolsVersion '31.0.0' defaultConfig { applicationId talkbackApplicationId versionName talkbackVersionName diff --git a/shared.gradle b/shared.gradle index a56cf9515..ecddb21d2 100644 --- a/shared.gradle +++ b/shared.gradle @@ -6,7 +6,7 @@ ext { } android { - compileSdkVersion 'android-30' + compileSdkVersion 'android-31' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java b/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java index fd26da5a8..f19a84d1a 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java +++ b/talkback/src/main/java/com/google/android/accessibility/talkback/gesture/GestureHistory.java @@ -114,7 +114,7 @@ private static class FileUtil { private static final String FILE_FOLDER_NAME = "Gesture"; private static final String FILE_NAME = "gesture.log"; private static final String FILE_AUTHORITY = - BuildConfig.APPLICATION_ID + ".providers.FileProvider"; + BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.FileProvider"; /** Writes gesture data into a file and return the file uri. */ public static Uri writeFile(Context context, Deque gestureInfos) { diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java index 691b6bd31..e10d3ddc7 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java +++ b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/CustomLabelManager.java @@ -76,7 +76,7 @@ public class CustomLabelManager implements LabelManager, AccessibilityEventListe public static final String EXTRA_STRING_ARRAY_PACKAGES = "EXTRA_STRING_ARRAY_PACKAGES"; @VisibleForTesting - static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".providers.LabelProvider"; + static final String AUTHORITY = BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.LabelProvider"; /** * The substring separating a label's package and view ID name in a fully-qualified resource diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java index f8d2d0b9e..8f789a288 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java +++ b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelManagerSummaryActivity.java @@ -59,7 +59,7 @@ public class LabelManagerSummaryActivity extends AppCompatActivity implements On /** File provider for custom label share intent. */ private static final String FILE_AUTHORITY = - BuildConfig.APPLICATION_ID + ".providers.FileProvider"; + BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.FileProvider"; private LabelProviderClient labelProviderClient; private ListView packageList; diff --git a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java index bf4662ed5..98856a436 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java +++ b/talkback/src/main/java/com/google/android/accessibility/talkback/labeling/LabelProvider.java @@ -47,7 +47,7 @@ public class LabelProvider extends ContentProvider { private static final String TAG = "LabelProvider"; - public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".providers.LabelProvider"; + public static final String AUTHORITY = BuildConfig.LIBRARY_PACKAGE_NAME + ".providers.LabelProvider"; static final String LABELS_PATH = "labels"; static final Uri LABELS_CONTENT_URI = new Uri.Builder().scheme("content").authority(AUTHORITY).path(LABELS_PATH).build(); From 70818a5b212a717f75c5c7e1a58a84779c47bc2e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 9 Mar 2021 22:43:36 -0500 Subject: [PATCH 02/18] disable aborting on lint errors --- shared.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared.gradle b/shared.gradle index ecddb21d2..986da31ef 100644 --- a/shared.gradle +++ b/shared.gradle @@ -16,6 +16,9 @@ android { multiDexEnabled true minSdkVersion 23 } + lintOptions { + abortOnError false + } } dependencies { From 9629b673dd8cdc2317aded9865dcb00ae6c573c3 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 14 Sep 2021 12:42:06 -0400 Subject: [PATCH 03/18] drop TfP from app name --- talkback/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/talkback/src/main/res/values/strings.xml b/talkback/src/main/res/values/strings.xml index 08366bba7..a9ca0c9e3 100644 --- a/talkback/src/main/res/values/strings.xml +++ b/talkback/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ - TalkBack_TfP + TalkBack + TalkBack TalkBack From 079d1eb9823c0d428122b67f22dc20175cfe25d2 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 16 Nov 2021 12:15:12 -0500 Subject: [PATCH 05/18] update Gradle to 7.3 --- gradle/wrapper/gradle-wrapper.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2bf6..e64c4192a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8d6843fd1ea4cbdf5e1f02c87c476c8dce0ad799 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 16 Nov 2021 12:17:29 -0500 Subject: [PATCH 06/18] use Java 11 source/target --- proguard/build.gradle | 3 +++ shared.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/proguard/build.gradle b/proguard/build.gradle index 9900fd60d..d16048b27 100644 --- a/proguard/build.gradle +++ b/proguard/build.gradle @@ -1 +1,4 @@ apply plugin: 'java-library' + +sourceCompatibility = 11 +targetCompatibility = 11 diff --git a/shared.gradle b/shared.gradle index 986da31ef..74de73d8a 100644 --- a/shared.gradle +++ b/shared.gradle @@ -8,8 +8,8 @@ ext { android { compileSdkVersion 'android-31' compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { vectorDrawables.useSupportLibrary = true From 6f7b46faf70916dfb644989ea10bac1ba33ce486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:47:38 +0000 Subject: [PATCH 07/18] Bump gradle from 7.0.2 to 7.0.3 Bumps gradle from 7.0.2 to 7.0.3. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b99c8ebd2..47418f69a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } dependencies { classpath 'org.aspectj:aspectjtools:1.8.1' - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' } } From 6e8288e19c8005285414437bfc859f7e9c8dbb85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 05:38:16 +0000 Subject: [PATCH 08/18] Bump aspectjtools from 1.8.1 to 1.9.7 Bumps [aspectjtools](https://github.com/eclipse/org.aspectj) from 1.8.1 to 1.9.7. - [Release notes](https://github.com/eclipse/org.aspectj/releases) - [Commits](https://github.com/eclipse/org.aspectj/commits) --- updated-dependencies: - dependency-name: org.aspectj:aspectjtools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 47418f69a..d695d290d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { google() } dependencies { - classpath 'org.aspectj:aspectjtools:1.8.1' + classpath 'org.aspectj:aspectjtools:1.9.7' classpath 'com.android.tools.build:gradle:7.0.3' } } From 6c9e6933988ef55082949b7d2e95f07777523c19 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 16 Nov 2021 14:47:00 -0500 Subject: [PATCH 09/18] add GitHub dependabot and CI configuration --- .github/dependabot.yml | 12 +++++++++++ .github/workflows/build.yml | 21 +++++++++++++++++++ .github/workflows/validate-gradle-wrapper.yml | 10 +++++++++ 3 files changed, 43 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/validate-gradle-wrapper.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..797a0703d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + target-branch: main + - package-ecosystem: gradle + directory: "/" + schedule: + interval: daily + target-branch: main diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..575c2a85d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,21 @@ +name: Build application + +on: + pull_request: + push: + branches: [main] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v2.3.1 + with: + distribution: 'temurin' + java-version: 17 + cache: gradle + - name: Build with Gradle + run: ./gradlew build --no-daemon diff --git a/.github/workflows/validate-gradle-wrapper.yml b/.github/workflows/validate-gradle-wrapper.yml new file mode 100644 index 000000000..405a2b306 --- /dev/null +++ b/.github/workflows/validate-gradle-wrapper.yml @@ -0,0 +1,10 @@ +name: "Validate Gradle Wrapper" +on: [push, pull_request] + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 From 86148d64fa1f1a37aea0e5126198c129ce9f5261 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 12 Oct 2021 01:17:03 -0400 Subject: [PATCH 10/18] target SDK 31, consistent JVM args, build with JDK 11, minSDK 26 Signed-off-by: June --- build.gradle | 2 +- gradle.properties | 6 +++--- shared.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d695d290d..de47ff264 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ android { versionName talkbackVersionName manifestPlaceholders = [talkbackMainPermission:talkbackMainPermission] minSdkVersion 26 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 370044210 versionName "2021-04-23" testInstrumentationRunner 'android.test.InstrumentationTestRunner' diff --git a/gradle.properties b/gradle.properties index a89bc4e9c..f55b0eda9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -android.useAndroidX = true -android.enableJetifier = true -org.gradle.jvmargs=-Xms512M -Xmx8G +android.useAndroidX=true +android.enableJetifier=true +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 diff --git a/shared.gradle b/shared.gradle index 74de73d8a..eda6ca973 100644 --- a/shared.gradle +++ b/shared.gradle @@ -14,7 +14,7 @@ android { defaultConfig { vectorDrawables.useSupportLibrary = true multiDexEnabled true - minSdkVersion 23 + minSdkVersion 26 } lintOptions { abortOnError false From 93f05dc8368be5fb981d3d98f6efbc8c94cfc2e8 Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Fri, 19 Nov 2021 10:16:54 +0100 Subject: [PATCH 11/18] Bump Guava version --- shared.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared.gradle b/shared.gradle index eda6ca973..00427357d 100644 --- a/shared.gradle +++ b/shared.gradle @@ -24,7 +24,7 @@ android { dependencies { // Google common - implementation 'com.google.guava:guava:22.0' + implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.android.material:material:1.1.0' // Support library From c070e000fc6d631cd34f43531971d7b7900e3fd7 Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Thu, 25 Nov 2021 16:54:39 +0100 Subject: [PATCH 12/18] Set android:exported to true for BrailleIme service --- brailleime/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/brailleime/src/main/AndroidManifest.xml b/brailleime/src/main/AndroidManifest.xml index bb84c9646..fce59890d 100644 --- a/brailleime/src/main/AndroidManifest.xml +++ b/brailleime/src/main/AndroidManifest.xml @@ -16,7 +16,8 @@ android:label="@string/braille_ime_service_name" android:enabled="false" android:directBootAware="true" - android:permission="android.permission.BIND_INPUT_METHOD"> + android:permission="android.permission.BIND_INPUT_METHOD" + android:exported="true"> From 6aa3166b2cc32bbb8d8619b0a14087441d4124cc Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Thu, 25 Nov 2021 16:58:37 +0100 Subject: [PATCH 13/18] Bump MinSdkVersion to 26 for brailleime --- brailleime/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brailleime/src/main/AndroidManifest.xml b/brailleime/src/main/AndroidManifest.xml index fce59890d..b2445bc51 100644 --- a/brailleime/src/main/AndroidManifest.xml +++ b/brailleime/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ package="com.google.android.accessibility.brailleime"> From 05a14fe56b14b32c794b17a870decef5c3f079ea Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Thu, 25 Nov 2021 16:59:52 +0100 Subject: [PATCH 14/18] Bump targetSdkVersion to 31 for brailleime --- brailleime/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brailleime/src/main/AndroidManifest.xml b/brailleime/src/main/AndroidManifest.xml index b2445bc51..2bbc6a9cc 100644 --- a/brailleime/src/main/AndroidManifest.xml +++ b/brailleime/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ + android:targetSdkVersion="31" /> From 5364b9d5156e939e98754af8e86f42ba5ccde35e Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Thu, 25 Nov 2021 17:12:19 +0100 Subject: [PATCH 15/18] Bump min and target SDK versions for ScreenCaptureController library --- .../accessibility/utils/screencapture/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/src/main/java/com/google/android/libraries/accessibility/utils/screencapture/AndroidManifest.xml b/utils/src/main/java/com/google/android/libraries/accessibility/utils/screencapture/AndroidManifest.xml index f31854451..8f21da3f3 100644 --- a/utils/src/main/java/com/google/android/libraries/accessibility/utils/screencapture/AndroidManifest.xml +++ b/utils/src/main/java/com/google/android/libraries/accessibility/utils/screencapture/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0.0" > + android:minSdkVersion="26" + android:targetSdkVersion="31" /> From 8837ff51b252a1eae74604197d81a99392a3901d Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Thu, 25 Nov 2021 17:18:50 +0100 Subject: [PATCH 16/18] Change repo to mavenCentral --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index de47ff264..2fdb63c34 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ dependencies { buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { @@ -23,7 +23,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() } } From e6be8dc63c8a06b9f16969d9ca5939fab9398e19 Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Mon, 29 Nov 2021 19:31:37 +0100 Subject: [PATCH 17/18] Bump actions/setup-java from 2.3.1 to 2.4.0 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 575c2a85d..3f24558bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 17 - uses: actions/setup-java@v2.3.1 + uses: actions/setup-java@v2.4.0 with: distribution: 'temurin' java-version: 17 From ddadcf2d3f7e6215e43e4aeee1b4bd8b1ae57bf3 Mon Sep 17 00:00:00 2001 From: Patryk Mis Date: Mon, 29 Nov 2021 20:56:45 +0100 Subject: [PATCH 18/18] Update dependencies --- shared.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/shared.gradle b/shared.gradle index 00427357d..4749693cc 100644 --- a/shared.gradle +++ b/shared.gradle @@ -25,24 +25,24 @@ dependencies { // Google common implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.4.0' // Support library - implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.annotation:annotation:1.3.0' + implementation 'androidx.appcompat:appcompat:1.4.0' implementation 'androidx.collection:collection:1.1.0' - implementation 'androidx.core:core:1.5.0-alpha01' - implementation 'androidx.fragment:fragment:1.2.0-rc03' + implementation 'androidx.core:core:1.7.0' + implementation 'androidx.fragment:fragment:1.4.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - implementation 'androidx.preference:preference:1.1.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.recyclerview:recyclerview:1.2.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' // Nullable - implementation 'org.checkerframework:checker-qual:2.5.8' + implementation 'org.checkerframework:checker-qual:3.19.0' // Auto-value - api 'com.google.auto.value:auto-value-annotations:1.7' - annotationProcessor 'com.google.auto.value:auto-value:1.7' + api 'com.google.auto.value:auto-value-annotations:1.8.2' + annotationProcessor 'com.google.auto.value:auto-value:1.8.2' implementation 'javax.annotation:javax.annotation-api:1.3.2' }