From 62c99ae5bec083b1f99bba348ee74e2672634156 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Tue, 16 Jan 2024 11:13:16 -0800 Subject: [PATCH] Update workflow to use JDK 17 --- .github/workflows/android.yml | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- AppWidget/gradle/wrapper/gradle-wrapper.properties | 2 +- DownloadableFonts/build.gradle | 4 ++-- DownloadableFonts/gradle/wrapper/gradle-wrapper.properties | 2 +- DragAndDrop/build.gradle | 7 ++++++- DragAndDrop/gradle/wrapper/gradle-wrapper.properties | 2 +- DragAndDrop/settings.gradle | 4 ---- EmojiCompat/gradle/wrapper/gradle-wrapper.properties | 2 +- Haptics/build.gradle | 7 +------ Haptics/gradle/wrapper/gradle-wrapper.properties | 2 +- ImmersiveMode/build.gradle | 2 +- ImmersiveMode/gradle/wrapper/gradle-wrapper.properties | 2 +- People/gradle/wrapper/gradle-wrapper.properties | 2 +- .../compose_app/gradle/wrapper/gradle-wrapper.properties | 2 +- PerAppLanguages/views_app/build.gradle | 4 ++-- .../views_app/gradle/wrapper/gradle-wrapper.properties | 2 +- Preferences/build.gradle | 2 +- Preferences/gradle/wrapper/gradle-wrapper.properties | 2 +- SplashScreen/gradle/wrapper/gradle-wrapper.properties | 2 +- Text/build.gradle | 4 ++-- Text/gradle/wrapper/gradle-wrapper.properties | 2 +- TextStyling/build.gradle | 6 +++--- TextStyling/gradle/wrapper/gradle-wrapper.properties | 2 +- WindowInsetsAnimation/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- WindowManager/build.gradle | 2 +- WindowManager/gradle/wrapper/gradle-wrapper.properties | 2 +- 28 files changed, 38 insertions(+), 42 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 92b46fdd5..2ba081ede 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,10 +28,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Generate cache key run: .github/scripts/checksum.sh checksum.txt diff --git a/ActivityEmbeddingWithPredictiveBack/gradle/wrapper/gradle-wrapper.properties b/ActivityEmbeddingWithPredictiveBack/gradle/wrapper/gradle-wrapper.properties index 996b39fed..204dafcf7 100644 --- a/ActivityEmbeddingWithPredictiveBack/gradle/wrapper/gradle-wrapper.properties +++ b/ActivityEmbeddingWithPredictiveBack/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Dec 07 10:07:34 CET 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/AppWidget/gradle/wrapper/gradle-wrapper.properties b/AppWidget/gradle/wrapper/gradle-wrapper.properties index c700ee372..b2c760344 100644 --- a/AppWidget/gradle/wrapper/gradle-wrapper.properties +++ b/AppWidget/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Apr 05 16:14:35 JST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/DownloadableFonts/build.gradle b/DownloadableFonts/build.gradle index ea649d9d9..05c5e3496 100644 --- a/DownloadableFonts/build.gradle +++ b/DownloadableFonts/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.1.3' apply false - id 'com.android.library' version '7.1.3' apply false + id 'com.android.application' version '7.4.1' apply false + id 'com.android.library' version '7.4.1' apply false id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } diff --git a/DownloadableFonts/gradle/wrapper/gradle-wrapper.properties b/DownloadableFonts/gradle/wrapper/gradle-wrapper.properties index ffed3a254..a59520664 100644 --- a/DownloadableFonts/gradle/wrapper/gradle-wrapper.properties +++ b/DownloadableFonts/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/DragAndDrop/build.gradle b/DragAndDrop/build.gradle index f757f23ee..d93f51b76 100644 --- a/DragAndDrop/build.gradle +++ b/DragAndDrop/build.gradle @@ -1,5 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.5.31' apply false +} + task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/DragAndDrop/gradle/wrapper/gradle-wrapper.properties b/DragAndDrop/gradle/wrapper/gradle-wrapper.properties index 204154bf8..2e6112904 100644 --- a/DragAndDrop/gradle/wrapper/gradle-wrapper.properties +++ b/DragAndDrop/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 21 19:03:22 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/DragAndDrop/settings.gradle b/DragAndDrop/settings.gradle index bcb8e7f30..56fb7befd 100644 --- a/DragAndDrop/settings.gradle +++ b/DragAndDrop/settings.gradle @@ -4,10 +4,6 @@ pluginManagement { google() mavenCentral() } - plugins { - id 'com.android.application' version '7.2.1' - id 'org.jetbrains.kotlin.android' version '1.5.31' - } } dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) diff --git a/EmojiCompat/gradle/wrapper/gradle-wrapper.properties b/EmojiCompat/gradle/wrapper/gradle-wrapper.properties index 8049c684f..a59520664 100644 --- a/EmojiCompat/gradle/wrapper/gradle-wrapper.properties +++ b/EmojiCompat/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Haptics/build.gradle b/Haptics/build.gradle index 01b524100..50586cfd4 100644 --- a/Haptics/build.gradle +++ b/Haptics/build.gradle @@ -26,11 +26,6 @@ task clean(type: Delete) { } subprojects { - repositories { - google() - mavenCentral() - } - apply plugin: 'com.diffplug.spotless' spotless { kotlin { @@ -44,4 +39,4 @@ subprojects { licenseHeaderFile rootProject.file('spotless/license.kt') } } -} \ No newline at end of file +} diff --git a/Haptics/gradle/wrapper/gradle-wrapper.properties b/Haptics/gradle/wrapper/gradle-wrapper.properties index 4fd4272a2..4c224cf66 100644 --- a/Haptics/gradle/wrapper/gradle-wrapper.properties +++ b/Haptics/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Mar 14 17:01:13 EDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/ImmersiveMode/build.gradle b/ImmersiveMode/build.gradle index ca1d57c31..e60486085 100644 --- a/ImmersiveMode/build.gradle +++ b/ImmersiveMode/build.gradle @@ -23,7 +23,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties index 6a9cb2c66..802f90650 100644 --- a/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties +++ b/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jul 29 13:23:26 JST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/People/gradle/wrapper/gradle-wrapper.properties b/People/gradle/wrapper/gradle-wrapper.properties index 0c61e11c5..f037728a0 100644 --- a/People/gradle/wrapper/gradle-wrapper.properties +++ b/People/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jun 01 15:45:45 JST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/PerAppLanguages/compose_app/gradle/wrapper/gradle-wrapper.properties b/PerAppLanguages/compose_app/gradle/wrapper/gradle-wrapper.properties index 65580cb6c..55e6638fc 100644 --- a/PerAppLanguages/compose_app/gradle/wrapper/gradle-wrapper.properties +++ b/PerAppLanguages/compose_app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jun 17 09:51:01 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/PerAppLanguages/views_app/build.gradle b/PerAppLanguages/views_app/build.gradle index 0829cee5e..d3194d8a0 100644 --- a/PerAppLanguages/views_app/build.gradle +++ b/PerAppLanguages/views_app/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.1' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10' // NOTE: Do not place your application dependencies here; they belong @@ -15,4 +15,4 @@ buildscript { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/PerAppLanguages/views_app/gradle/wrapper/gradle-wrapper.properties b/PerAppLanguages/views_app/gradle/wrapper/gradle-wrapper.properties index 5ef4175cb..8890ca67d 100644 --- a/PerAppLanguages/views_app/gradle/wrapper/gradle-wrapper.properties +++ b/PerAppLanguages/views_app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Apr 01 12:11:14 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/Preferences/build.gradle b/Preferences/build.gradle index 8d96211d9..af2e305a3 100644 --- a/Preferences/build.gradle +++ b/Preferences/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/Preferences/gradle/wrapper/gradle-wrapper.properties b/Preferences/gradle/wrapper/gradle-wrapper.properties index e3255b4aa..29451ad50 100644 --- a/Preferences/gradle/wrapper/gradle-wrapper.properties +++ b/Preferences/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jun 01 15:51:34 JST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/SplashScreen/gradle/wrapper/gradle-wrapper.properties b/SplashScreen/gradle/wrapper/gradle-wrapper.properties index 9c84ace5e..a56e81de2 100644 --- a/SplashScreen/gradle/wrapper/gradle-wrapper.properties +++ b/SplashScreen/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jul 29 11:47:27 JST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/Text/build.gradle b/Text/build.gradle index ac1f935e9..acd3bc6ab 100644 --- a/Text/build.gradle +++ b/Text/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'com.android.application' version '7.2.1' apply false - id 'com.android.library' version '7.2.1' apply false + id 'com.android.application' version '7.4.1' apply false + id 'com.android.library' version '7.4.1' apply false id 'org.jetbrains.kotlin.android' version '1.6.21' apply false } diff --git a/Text/gradle/wrapper/gradle-wrapper.properties b/Text/gradle/wrapper/gradle-wrapper.properties index 458a33a21..42b625ba6 100644 --- a/Text/gradle/wrapper/gradle-wrapper.properties +++ b/Text/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jun 02 11:03:52 JST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/TextStyling/build.gradle b/TextStyling/build.gradle index 1676f95c4..24405599a 100644 --- a/TextStyling/build.gradle +++ b/TextStyling/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.4.21' + ext.kotlin_version = '1.7.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -62,4 +62,4 @@ ext { androidktx = "1.0.1" dexmakerVersion = '1.2' dexmakerMockitoVersion = '1.2' -} \ No newline at end of file +} diff --git a/TextStyling/gradle/wrapper/gradle-wrapper.properties b/TextStyling/gradle/wrapper/gradle-wrapper.properties index 4d9ca1649..8049c684f 100644 --- a/TextStyling/gradle/wrapper/gradle-wrapper.properties +++ b/TextStyling/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/WindowInsetsAnimation/build.gradle b/WindowInsetsAnimation/build.gradle index 5f7d09259..5413753d8 100644 --- a/WindowInsetsAnimation/build.gradle +++ b/WindowInsetsAnimation/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/WindowInsetsAnimation/gradle/wrapper/gradle-wrapper.properties b/WindowInsetsAnimation/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..a59520664 100644 --- a/WindowInsetsAnimation/gradle/wrapper/gradle-wrapper.properties +++ b/WindowInsetsAnimation/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/WindowManager/build.gradle b/WindowManager/build.gradle index c9a33ce66..dc72dd995 100644 --- a/WindowManager/build.gradle +++ b/WindowManager/build.gradle @@ -24,7 +24,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/WindowManager/gradle/wrapper/gradle-wrapper.properties b/WindowManager/gradle/wrapper/gradle-wrapper.properties index ffed3a254..a59520664 100644 --- a/WindowManager/gradle/wrapper/gradle-wrapper.properties +++ b/WindowManager/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists