Update test-fixture dependencies and workflows (#332)

* Gradle 8.0.2 for test-fixture. Update Gradle build cache in workflows. * Update all dependencies for `test-fixture`. * Add missing JVM target.
ReactiveCircus · Mar 18, 2023 · a2c97ef · a2c97ef
1 parent 8c71f5e
commit a2c97ef
Show file tree

Hide file tree

Showing 11 changed files with 246 additions and 195 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,11 +61,11 @@ jobs:
         npm run lint
         npm test
 
-    - name: Java 15
-      uses: actions/setup-java@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 15
+        java-version: 19
+
     - uses: actions/cache@v3
       id: avd-cache
       with:

diff --git a/.github/workflows/manually.yml b/.github/workflows/manually.yml
@@ -51,17 +51,14 @@ jobs:
         npm run lint
         npm test
 
-    - name: Java 15
-      uses: actions/setup-java@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 15
-    - uses: actions/cache@v3
+        java-version: 19
+
+    - uses: gradle/gradle-build-action@v2
       with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+        gradle-home-cache-cleanup: true
 
     - name: run action
       uses: ./

diff --git a/test-fixture/.gitignore b/test-fixture/.gitignore
@@ -0,0 +1,8 @@
+.gradle
+build/
+target/
+out/
+local.properties
+.idea/
+*.iml
+*.DS_Store
diff --git a/test-fixture/app/build.gradle b/test-fixture/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 33
-    buildToolsVersion "33.0.0"
+    buildToolsVersion "33.0.2"
 
     defaultConfig {
         applicationId "com.example.testapp"
@@ -15,18 +15,21 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/test-fixture/app/proguard-rules.pro b/test-fixture/app/proguard-rules.pro
diff --git a/test-fixture/build.gradle b/test-fixture/build.gradle
@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.0'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/test-fixture/gradle.properties b/test-fixture/gradle.properties
@@ -2,26 +2,11 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
 
-# Enable Kotlin incremental compilation
-kotlin.incremental=true
-
 # Enable parallel tasks execution for Kotlin Gradle plugin
 kotlin.parallel.tasks.in.project=true
 
 # Kotlin code style
 kotlin.code.style=official
 
-# Run kapt directly using Gradle workers
-kapt.use.worker.api=true
-
-# Enable incremental annotation processor for KAPT
-kapt.incremental.apt=true
-
-# Turn off AP discovery in compile path to enable compile avoidance
-kapt.include.compile.classpath=false
-
-# Use R8 instead of ProGuard for code shrinking.
-android.enableR8.fullMode=true
-
 # Enable AndroidX
 android.useAndroidX=true
diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.jar b/test-fixture/gradle/wrapper/gradle-wrapper.jar
diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 26 18:34:05 AEDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip