small cleanup

Author: jdvp

.github/workflows/commit_validation.yml

@@ -13,8 +13,9 @@ jobs:
       uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: '17'
-        cache: 'gradle'
+        java-version: '21'
+
+    - uses: gradle/actions/setup-gradle@v5
 
     - name: Lint
       run: ./gradlew clean lint 
@@ -38,8 +39,9 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '17'
-          cache: 'gradle'
+          java-version: '21'
+
+      - uses: gradle/actions/setup-gradle@v5
 
       - name: Enable KVM group perms (needed for reactivecircus/android-emulator-runner below)
         run: |

.github/workflows/gradle_validation.yml

@@ -36,8 +36,9 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '17'
-          cache: 'gradle'
+          java-version: '21'
+
+      - uses: gradle/actions/setup-gradle@v5
 
       - name: Lint & Unit Test
         run: ./gradlew clean lint test

.gitignore

@@ -7,6 +7,7 @@
 /build
 /captures
 .externalNativeBuild
+ajcore**.*
 
 .idea
 build

app/build.gradle

@@ -1,10 +1,8 @@
 apply plugin: "com.android.application"
 apply plugin: "com.ibotta.gradle.aop"
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+kotlin {
+    jvmToolchain(21)
 }
 
 android {

gradle.properties

@@ -1,20 +1,3 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-#Jetifier no longer needed
-android.enableJetifier=false
-android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
+org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8 -XX:+UseParallelGC
+kotlin.code.style=official
 android.newDsl=false