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 dd28ab7e..9ae6bf2a 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -15,29 +15,237 @@
 name: Android CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ main ]
   pull_request:
     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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ActionOpenDocument-build
+          path: ActionOpenDocument/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ActionOpenDocumentTree-build
+          path: ActionOpenDocumentTree/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ContentProviderPaging-build
+          path: ContentProviderPaging/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ContentProviderPagingKotlin-build
+          path: ContentProviderPagingKotlin/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: FileManager-build
+          path: FileManager/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: FileProvider-build
+          path: FileProvider/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: MediaStore-build
+          path: MediaStore/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: SafDemos-build
+          path: SafDemos/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ScopedStorage-build
+          path: ScopedStorage/app/build/outputs/
+
+  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
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: SharingShortcuts-build
+          path: SharingShortcuts/Application/build/outputs/
 
-  build:
-    name: Build
-    runs-on: ubuntu-18.04
+  StorageClient:
+    name: StorageClient
+    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: 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
+    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:
+          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@v1
+      - name: Build
+        working-directory: StorageProvider
+        run: ./gradlew assembleDebug
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: assemble
-          path: assemble.zip
+          name: StorageProvider-build
+          path: StorageProvider/Application/build/outputs/
\ No newline at end of file
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 ]
 
diff --git a/FileManager/app/build.gradle b/FileManager/app/build.gradle
index 2967fb50..7f62ed1c 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"
@@ -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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.samples.filemanager">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission
         android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
diff --git a/FileManager/build.gradle b/FileManager/build.gradle
index 16707db5..36357b3b 100644
--- a/FileManager/build.gradle
+++ b/FileManager/build.gradle
@@ -17,13 +17,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    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/FileManager/gradle/wrapper/gradle-wrapper.properties b/FileManager/gradle/wrapper/gradle-wrapper.properties
index 894f21c1..b480f2b5 100644
--- a/FileManager/gradle/wrapper/gradle-wrapper.properties
+++ b/FileManager/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
diff --git a/FileProvider/app/build.gradle b/FileProvider/app/build.gradle
index 69b1d05d..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 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.example.graygallery"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -54,6 +53,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..6f9b027a 100644
--- a/FileProvider/app/src/main/AndroidManifest.xml
+++ b/FileProvider/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.graygallery">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Used to download images from Unsplash -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -40,7 +39,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
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
diff --git a/SafDemos/app/build.gradle b/SafDemos/app/build.gradle
index 0addac56..2503aa54 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"
 
@@ -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.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.samples.safdemos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -25,7 +24,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
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