Merge pull request #21 from stslex/dev

fix fastlane

Author: stslex

.github/workflows/android.yml

@@ -20,10 +20,10 @@ jobs:
           echo "${{ secrets.KEYSTORE }}" > keystore.jks.asc
           gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch keystore.jks.asc > keystore.jks
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 

.github/workflows/android_deploy_beta.yml

@@ -33,10 +33,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 

.github/workflows/android_deploy_prod.yml

@@ -31,10 +31,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -81,7 +81,7 @@ jobs:
           echo "$PLAY_CONFIG_JSON" > play_config.json.b64
           base64 -d -i play_config.json.b64 > play_config.json
 
-      - name: Distribute app to Beta track 🚀
+      - name: Distribute app to Prod track 🚀
         run: bundle exec fastlane deploy
 
       - name: Commit files

.gitignore

@@ -12,3 +12,4 @@ local.properties
 play_config.*
 keystore.*
 build
+/fastlane/report.xml

Gemfile

@@ -1,3 +1,7 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
+gem "abbrev", "~> 0.1.2"

Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       base64
       nkf
       rexml
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
@@ -223,6 +224,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  abbrev (~> 0.1.2)
   fastlane
 
 BUNDLED WITH

app/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
         implementation(google.dagger.core)
         kapt(google.dagger.compiler)
         implementation(glide.core)
-        annotationProcessor(glide.compiler)
+        kapt(glide.compiler)
         implementation(retrofit.core)
         implementation(retrofit.converter.gson)
         implementation(okhttp3.logging.interceptor)

build-logic/dependencies/build.gradle.kts

@@ -10,6 +10,11 @@ dependencies {
     compileOnly(libs.android.tools.common)
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 tasks {
     validatePlugins {
         enableStricterValidation = true
@@ -19,7 +24,6 @@ tasks {
 
 gradlePlugin {
     plugins {
-
         register("androidApplication") {
             id = libs.plugins.app.android.application.get().pluginId
             implementationClass = "AndroidApplicationPlugin"

build-logic/dependencies/src/main/kotlin/AndroidApplicationPlugin.kt

@@ -33,7 +33,7 @@ class AndroidApplicationPlugin : Plugin<Project> {
                     versionName = libs.findVersionString("versionName")
                     versionCode = libs.findVersionInt("versionCode")
 
-//                    configureSigning(target)
+                    configureSigning(target)
                 }
             }
 

build-logic/dependencies/src/main/kotlin/com/stslex/splashgallery/KotlinAndroid.kt

@@ -11,10 +11,14 @@ import com.stslex.splashgallery.AppExt.findVersionInt
 import com.stslex.splashgallery.AppExt.libs
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.properties.Properties
 
@@ -54,14 +58,17 @@ private fun Project.configureKotlinAndroid(
         ).let { properties ->
             setLocalProperties(properties)
         }
+
     }
 
     compileOptions {
         // Up to Java 11 APIs are available through desugaring
         // https://developer.android.com/studio/write/java11-minimal-support-table
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+
         isCoreLibraryDesugaringEnabled = true
+
     }
 
     configureKotlin()
@@ -87,6 +94,16 @@ private fun Project.configureKotlin() {
             freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
         }
     }
+
+    extensions.configure<KotlinProjectExtension> {
+        jvmToolchain(17)
+    }
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+
+    }
 }
 
 fun DefaultConfig.setLocalProperties(