From 590cfb33a753330ae2b4d9c70519e2eb94b49120 Mon Sep 17 00:00:00 2001 From: cartland Date: Thu, 17 Apr 2025 11:33:09 -0700 Subject: [PATCH 01/14] Add workflow_dispatch trigger to workflows from GitHub --- .github/workflows/android.yml | 1 + .github/workflows/copy-branch.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index dd28ab7e..04602b6d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,6 +15,7 @@ name: Android CI on: + workflow_dispatch: push: branches: [ main ] pull_request: diff --git a/.github/workflows/copy-branch.yml b/.github/workflows/copy-branch.yml index f8f8572d..a1a0f006 100644 --- a/.github/workflows/copy-branch.yml +++ b/.github/workflows/copy-branch.yml @@ -5,6 +5,7 @@ name: Duplicates main to old master branch # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the main branch on: + workflow_dispatch: push: branches: [ main ] From fc95400a7f83d0041851c5f23d9f9c5d4de5ab42 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 14:10:17 -0700 Subject: [PATCH 02/14] Update build workflow to use ubuntu-20.04 Fixes this error: The ubuntu-18.04 environment is deprecated, consider switching to ubuntu-20.04(ubuntu-latest), or ubuntu-22.04 instead. For more details see https://github.com/actions/runner-images/issues/6002 --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 04602b6d..b83526e6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,7 +25,7 @@ jobs: build: name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 From 9d4c14b0e9d15ad5f55e83d3983596d4e8d95719 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 14:29:57 -0700 Subject: [PATCH 03/14] Update build workflow to use ubuntu-latest Responding to error: "This is a scheduled Ubuntu 20.04 retirement. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see https://github.com/actions/runner-images/issues/11101"" --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b83526e6..b823b49c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,7 +25,7 @@ jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From d4efadaee0e114911aa9044ea9bc2c48b67332d3 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:11:57 -0700 Subject: [PATCH 04/14] Upgrade actions/upload-artifact@v3 The builds are failing: * Error: Missing download info for actions/upload-artifact@v1 --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b823b49c..96ac606c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,7 +38,7 @@ jobs: - name: Zip artifacts run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so' - name: Upload artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: assemble path: assemble.zip From 3683ddd096ea395e3e03570264e27ea03e0d5c6d Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:16:41 -0700 Subject: [PATCH 05/14] Upgrade actions/checkout@v4 and actions/setup-java@v2 The builds are failing and need the updated versions: * actions/checkout@v4 * actions/setup-java@v2 --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 96ac606c..adc559c5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,9 +28,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 - name: Build project From cdbf63b29fe90d79058f9c2a3f4a526cab8d0a5e Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:20:02 -0700 Subject: [PATCH 06/14] Upgrade actions/upload-artifact@v4 --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index adc559c5..537b3539 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,7 +38,7 @@ jobs: - name: Zip artifacts run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so' - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: assemble path: assemble.zip From a74476902a845dad98d89e1adfe082cc3b1f00d0 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:24:44 -0700 Subject: [PATCH 07/14] Update build workflow to use Zulu distribution --- .github/workflows/android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 537b3539..e5b951c5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,6 +32,7 @@ jobs: - name: set up JDK 11 uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 11 - name: Build project run: .github/scripts/gradlew_recursive.sh assembleDebug From 31038bdaec3fb32f96d7bcfa4de05874816e817f Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 10:48:57 -0700 Subject: [PATCH 08/14] Refactor Android workflow to build each sample This commit refactors the Android workflow to build each sample individually. - Removes the gradlew_recursive.sh script. - Adds individual jobs for each sample. - Each job checks out the code, sets up JDK 11, and builds the sample. --- .github/scripts/gradlew_recursive.sh | 36 ------ .github/workflows/android.yml | 166 +++++++++++++++++++++++++-- 2 files changed, 156 insertions(+), 46 deletions(-) delete mode 100755 .github/scripts/gradlew_recursive.sh diff --git a/.github/scripts/gradlew_recursive.sh b/.github/scripts/gradlew_recursive.sh deleted file mode 100755 index e554ee8c..00000000 --- a/.github/scripts/gradlew_recursive.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2020 The Android Open Source Project -# -# 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 -# -# https://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. - -set -xe - -# Default Gradle settings are not optimal for Android builds, override them -# here to make the most out of the GitHub Actions build servers -GRADLE_OPTS="$GRADLE_OPTS -Xms4g -Xmx4g" -GRADLE_OPTS="$GRADLE_OPTS -XX:+HeapDumpOnOutOfMemoryError" -GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.daemon=false" -GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.workers.max=2" -GRADLE_OPTS="$GRADLE_OPTS -Dkotlin.incremental=false" -GRADLE_OPTS="$GRADLE_OPTS -Dkotlin.compiler.execution.strategy=in-process" -GRADLE_OPTS="$GRADLE_OPTS -Dfile.encoding=UTF-8" -export GRADLE_OPTS - -# Crawl all gradlew files which indicate an Android project -# You may edit this if your repo has a different project structure -for GRADLEW in `find . -name "gradlew"` ; do - SAMPLE=$(dirname "${GRADLEW}") - # Tell Gradle that this is a CI environment and disable parallel compilation - bash "$GRADLEW" -p "$SAMPLE" -Pci --no-parallel --stacktrace $@ -done diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e5b951c5..a2b8eee8 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,11 +22,149 @@ on: branches: [ main ] jobs: + ActionOpenDocument: + name: ActionOpenDocument + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: ActionOpenDocument + run: ./gradlew assembleDebug + + ActionOpenDocumentTree: + name: ActionOpenDocumentTree + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: ActionOpenDocumentTree + run: ./gradlew assembleDebug + + ContentProviderPaging: + name: ContentProviderPaging + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: ContentProviderPaging + run: ./gradlew assembleDebug + + ContentProviderPagingKotlin: + name: ContentProviderPagingKotlin + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: ContentProviderPagingKotlin + run: ./gradlew assembleDebug + + FileManager: + name: FileManager + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: FileManager + run: ./gradlew assembleDebug + + FileProvider: + name: FileProvider + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: FileProvider + run: ./gradlew assembleDebug + + MediaStore: + name: MediaStore + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: MediaStore + run: ./gradlew assembleDebug + + SafDemos: + name: SafDemos + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: SafDemos + run: ./gradlew assembleDebug + + ScopedStorage: + name: ScopedStorage + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: ScopedStorage + run: ./gradlew assembleDebug - build: - name: Build + SharingShortcuts: + name: SharingShortcuts runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: SharingShortcuts + run: ./gradlew assembleDebug + StorageClient: + name: StorageClient + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: set up JDK 11 @@ -34,12 +172,20 @@ jobs: with: distribution: 'zulu' java-version: 11 - - name: Build project - run: .github/scripts/gradlew_recursive.sh assembleDebug - - name: Zip artifacts - run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so' - - name: Upload artifacts - uses: actions/upload-artifact@v4 + - name: Build + working-directory: StorageClient + run: ./gradlew assembleDebug + + StorageProvider: + name: StorageProvider + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - name: assemble - path: assemble.zip + distribution: 'zulu' + java-version: 11 + - name: Build + working-directory: StorageProvider + run: ./gradlew assembleDebug From 3bf557c9d5d22e8f39a2eae5d4ec899d147d3c07 Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 10:54:11 -0700 Subject: [PATCH 09/14] Add workflow to upload build artifacts for each sample This commit adds a new job to the Android workflow that uploads the build artifacts for each sample. - Uses actions/upload-artifact@v4 to upload the build artifacts. - Sets the name of the artifact to the sample name plus "-build". - Sets the path to the app/build/outputs/ directory for each sample. --- .github/workflows/android.yml | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a2b8eee8..9ae6bf2a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -35,6 +35,11 @@ jobs: - name: Build working-directory: ActionOpenDocument run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ActionOpenDocument-build + path: ActionOpenDocument/app/build/outputs/ ActionOpenDocumentTree: name: ActionOpenDocumentTree @@ -49,6 +54,11 @@ jobs: - name: Build working-directory: ActionOpenDocumentTree run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ActionOpenDocumentTree-build + path: ActionOpenDocumentTree/app/build/outputs/ ContentProviderPaging: name: ContentProviderPaging @@ -63,6 +73,11 @@ jobs: - name: Build working-directory: ContentProviderPaging run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ContentProviderPaging-build + path: ContentProviderPaging/app/build/outputs/ ContentProviderPagingKotlin: name: ContentProviderPagingKotlin @@ -77,6 +92,11 @@ jobs: - name: Build working-directory: ContentProviderPagingKotlin run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ContentProviderPagingKotlin-build + path: ContentProviderPagingKotlin/app/build/outputs/ FileManager: name: FileManager @@ -91,6 +111,11 @@ jobs: - name: Build working-directory: FileManager run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: FileManager-build + path: FileManager/app/build/outputs/ FileProvider: name: FileProvider @@ -105,6 +130,11 @@ jobs: - name: Build working-directory: FileProvider run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: FileProvider-build + path: FileProvider/app/build/outputs/ MediaStore: name: MediaStore @@ -119,6 +149,11 @@ jobs: - name: Build working-directory: MediaStore run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: MediaStore-build + path: MediaStore/app/build/outputs/ SafDemos: name: SafDemos @@ -133,6 +168,11 @@ jobs: - name: Build working-directory: SafDemos run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: SafDemos-build + path: SafDemos/app/build/outputs/ ScopedStorage: name: ScopedStorage @@ -147,6 +187,11 @@ jobs: - name: Build working-directory: ScopedStorage run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: ScopedStorage-build + path: ScopedStorage/app/build/outputs/ SharingShortcuts: name: SharingShortcuts @@ -161,6 +206,11 @@ jobs: - name: Build working-directory: SharingShortcuts run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: SharingShortcuts-build + path: SharingShortcuts/Application/build/outputs/ StorageClient: name: StorageClient @@ -175,6 +225,11 @@ jobs: - name: Build working-directory: StorageClient run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: StorageClient-build + path: StorageClient/Application/build/outputs/ StorageProvider: name: StorageProvider @@ -189,3 +244,8 @@ jobs: - name: Build working-directory: StorageProvider run: ./gradlew assembleDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: StorageProvider-build + path: StorageProvider/Application/build/outputs/ \ No newline at end of file From 0146e3ec0403407e4b0f3802472556903895c025 Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 11:00:50 -0700 Subject: [PATCH 10/14] Respond to errors in FileManager, FileProvider, SafDemos This commit updates the buildToolsVersion and targetSdkVersion in the build.gradle files of the FileManager, FileProvider, and SafDemos samples. - FileManager: - Updated buildToolsVersion from "29.0.2" to "30.0.3" - FileProvider: - Updated buildToolsVersion from "29.0.3" to "30.0.3" - Updated targetSdkVersion from 29 to 30 - SafDemos: - Updated targetSdkVersion from 29 to 31 --- FileManager/app/build.gradle | 2 +- FileProvider/app/build.gradle | 6 +++--- SafDemos/app/build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FileManager/app/build.gradle b/FileManager/app/build.gradle index 2967fb50..3911ec3a 100644 --- a/FileManager/app/build.gradle +++ b/FileManager/app/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 30 - buildToolsVersion "29.0.2" + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.android.samples.filemanager" diff --git a/FileProvider/app/build.gradle b/FileProvider/app/build.gradle index 69b1d05d..ef6c65e9 100644 --- a/FileProvider/app/build.gradle +++ b/FileProvider/app/build.gradle @@ -19,13 +19,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.example.graygallery" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" diff --git a/SafDemos/app/build.gradle b/SafDemos/app/build.gradle index 0addac56..fa7fa20b 100644 --- a/SafDemos/app/build.gradle +++ b/SafDemos/app/build.gradle @@ -19,12 +19,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 + compileSdkVersion 31 defaultConfig { applicationId "com.android.samples.safdemos" minSdkVersion 19 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 versionName "1.0" From 55d81f418cea283af4eccf4741d82743c59e5417 Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 11:20:25 -0700 Subject: [PATCH 11/14] Update FileManager sample's gradle This commit updates the Gradle version of the FileManager sample. - Updates the Gradle version to 7.5. - Updates the AGP version to 7.4.2. - Updates the Kotlin version to 1.6.21. - Sets the namespace in the module build file. --- FileManager/app/build.gradle | 1 + FileManager/app/src/main/AndroidManifest.xml | 3 +-- FileManager/build.gradle | 4 ++-- FileManager/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FileManager/app/build.gradle b/FileManager/app/build.gradle index 3911ec3a..7f62ed1c 100644 --- a/FileManager/app/build.gradle +++ b/FileManager/app/build.gradle @@ -54,6 +54,7 @@ android { kotlinOptions { jvmTarget = "1.8" } + namespace 'com.android.samples.filemanager' } diff --git a/FileManager/app/src/main/AndroidManifest.xml b/FileManager/app/src/main/AndroidManifest.xml index 897a4427..a2ee6c6e 100644 --- a/FileManager/app/src/main/AndroidManifest.xml +++ b/FileManager/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Fri, 11 Jul 2025 11:24:10 -0700 Subject: [PATCH 12/14] Update FileProvider sample's gradle This commit updates the Gradle version of the FileProvider sample. - Updates the Gradle version to 7.5. - Updates the AGP version to 7.4.2. - Updates the Kotlin version to 1.6.21. - Sets the namespace in the module build file. --- FileProvider/app/build.gradle | 1 + FileProvider/app/src/main/AndroidManifest.xml | 3 +-- FileProvider/build.gradle | 4 ++-- FileProvider/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FileProvider/app/build.gradle b/FileProvider/app/build.gradle index ef6c65e9..6b91cb18 100644 --- a/FileProvider/app/build.gradle +++ b/FileProvider/app/build.gradle @@ -54,6 +54,7 @@ android { resValues = false shaders = false } + namespace 'com.example.graygallery' } dependencies { diff --git a/FileProvider/app/src/main/AndroidManifest.xml b/FileProvider/app/src/main/AndroidManifest.xml index 712da8c2..a3e84573 100644 --- a/FileProvider/app/src/main/AndroidManifest.xml +++ b/FileProvider/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/FileProvider/build.gradle b/FileProvider/build.gradle index 3fd3e9e3..dffde64e 100644 --- a/FileProvider/build.gradle +++ b/FileProvider/build.gradle @@ -16,13 +16,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.3.72" + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/FileProvider/gradle/wrapper/gradle-wrapper.properties b/FileProvider/gradle/wrapper/gradle-wrapper.properties index 21aa1969..e2af9097 100644 --- a/FileProvider/gradle/wrapper/gradle-wrapper.properties +++ b/FileProvider/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip From d163b6e8b6a876ed51cc5593c4e8be25ccc3a8eb Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 11:27:27 -0700 Subject: [PATCH 13/14] Update FileProvider sample's target SDK This commit updates the targetSdkVersion in the build.gradle file of the FileProvider sample. - Updated targetSdkVersion from 30 to 31 - Added exported=true to MainActivity --- FileProvider/app/build.gradle | 5 ++--- FileProvider/app/src/main/AndroidManifest.xml | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FileProvider/app/build.gradle b/FileProvider/app/build.gradle index 6b91cb18..8bb3ca8f 100644 --- a/FileProvider/app/build.gradle +++ b/FileProvider/app/build.gradle @@ -19,13 +19,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 31 defaultConfig { applicationId "com.example.graygallery" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1 versionName "1.0" diff --git a/FileProvider/app/src/main/AndroidManifest.xml b/FileProvider/app/src/main/AndroidManifest.xml index a3e84573..6f9b027a 100644 --- a/FileProvider/app/src/main/AndroidManifest.xml +++ b/FileProvider/app/src/main/AndroidManifest.xml @@ -39,7 +39,8 @@ + android:exported="true" + > From 88f847785cc2adaf135db82635e44463b65fd9e8 Mon Sep 17 00:00:00 2001 From: cartland Date: Fri, 11 Jul 2025 11:32:30 -0700 Subject: [PATCH 14/14] Update SafDemos sample's gradle This commit updates the Gradle version of the SafDemos sample. - Updates the Gradle version to 7.5. - Updates the AGP version to 7.4.2. - Updates the Kotlin version to 1.6.21. - Sets the namespace in the module build file. - Added exported=true to MainActivity --- SafDemos/app/build.gradle | 1 + SafDemos/app/src/main/AndroidManifest.xml | 7 ++++--- SafDemos/build.gradle | 4 ++-- SafDemos/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/SafDemos/app/build.gradle b/SafDemos/app/build.gradle index fa7fa20b..2503aa54 100644 --- a/SafDemos/app/build.gradle +++ b/SafDemos/app/build.gradle @@ -45,6 +45,7 @@ android { viewBinding { enabled = true } + namespace 'com.android.samples.safdemos' } dependencies { diff --git a/SafDemos/app/src/main/AndroidManifest.xml b/SafDemos/app/src/main/AndroidManifest.xml index 1cb600fe..f49e4091 100644 --- a/SafDemos/app/src/main/AndroidManifest.xml +++ b/SafDemos/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + - + diff --git a/SafDemos/build.gradle b/SafDemos/build.gradle index 8095bbc8..16b77fd2 100644 --- a/SafDemos/build.gradle +++ b/SafDemos/build.gradle @@ -17,14 +17,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.71' + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/SafDemos/gradle/wrapper/gradle-wrapper.properties b/SafDemos/gradle/wrapper/gradle-wrapper.properties index 2207b77a..59c5cc1f 100644 --- a/SafDemos/gradle/wrapper/gradle-wrapper.properties +++ b/SafDemos/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Aug 27 23:32:13 KST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME