Merge pull request #2 from imgly/update-master

Update master
imgly · Sep 23, 2024 · 08304f0 · 08304f0
2 parents e798f95 + 335da0f
commit 08304f0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [7.6.3, 8.4]
+        gradle: [7.6.3, 8.4, 8.6]
         java: [11, 17]
-        agp: [7.4.2, 8.1.2]
-        kotlin: [1.7.21, 1.8.22, 1.9.10]
+        agp: [7.4.2, 8.1.2, 8.4.0]
+        kotlin: [1.7.21, 1.8.10, 1.8.22, 1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23]
         exclude:
           # AGP 8.0+ requires Gradle 8.0
           - agp: 8.1.2
@@ -23,17 +23,36 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Install JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
+
+      - name: Set KSP Version
+        id: ksp-version
+        run: |
+          case ${{ matrix.kotlin }} in
+            1.7.21) echo "::set-output name=KSP_VERSION::1.7.21-1.0.8" ;;
+            1.8.10) echo "::set-output name=KSP_VERSION::1.8.10-1.0.9" ;;
+            1.8.22) echo "::set-output name=KSP_VERSION::1.8.22-1.0.11" ;;
+            1.9.0) echo "::set-output name=KSP_VERSION::1.9.0-1.0.12" ;;
+            1.9.10) echo "::set-output name=KSP_VERSION::1.9.10-1.0.13" ;;
+            1.9.20) echo "::set-output name=KSP_VERSION::1.9.20-1.0.14" ;;
+            1.9.21) echo "::set-output name=KSP_VERSION::1.9.21-1.0.16" ;;
+            1.9.22) echo "::set-output name=KSP_VERSION::1.9.22-1.0.17" ;;
+            1.9.23) echo "::set-output name=KSP_VERSION::1.9.23-1.0.19" ;;
+            *) echo "Error: Unknown Kotlin-KSP version combination ${{ matrix.kotlin }}"; exit 1 ;;
+          esac
+
       - name: Build with Gradle
         uses: eskatos/gradle-command-action@v1
         with:
           gradle-version: ${{ matrix.gradle }}
-          arguments: :app:assembleDebug -PagpVersion=${{ matrix.agp }} -PkotlinVersion=${{ matrix.kotlin }} --scan
+          arguments: assembleDebug -PagpVersion=${{ matrix.agp }} -PkotlinVersion=${{ matrix.kotlin }} -PkspVersion=${{ steps.ksp-version.outputs.KSP_VERSION }} --scan
+
       - name: Upload APK
         uses: actions/upload-artifact@v2
         with:
-          name: G-${{ matrix.gradle }}-J-${{ matrix.java }}-AGP-${{ matrix.agp }}-K-${{ matrix.kotlin }}
+          name: apk-${{ matrix.gradle }}-${{ matrix.java }}-${{ matrix.agp }}-${{ matrix.kotlin }}-${{ steps.ksp-version.outputs.KSP_VERSION }}
           path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,11 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'ly.img.android.sdk'
+    id 'com.google.devtools.ksp'
+}
+
+kotlin {
+    jvmToolchain(8)
 }
 
 imglyConfig {
@@ -51,7 +56,7 @@ imglyConfig {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 35
     namespace "com.imgly.test"
 
     defaultConfig {

diff --git a/build.gradle b/build.gradle
@@ -1,18 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlinVersion = findProperty("kotlinVersion")?.toString() ?: "1.6.21"
-        agpVersion = findProperty("agpVersion")?.toString() ?: "7.1.3"
+        kotlinVersion = findProperty("kotlinVersion")?.toString() ?: "1.8.10"
+        ksp_version = findProperty("kspVersion")?.toString() ?: "1.8.0-1.0.9"
+        agpVersion = findProperty("agpVersion")?.toString() ?: "8.4.0"
     }
     repositories {
         google()
         mavenCentral()
         maven { url 'https://artifactory.img.ly/artifactory/imgly' }
+        maven { url 'https://artifactory.img.ly/artifactory/imgly_development' }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$agpVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'ly.img.android.pesdk:plugin:10.7.1'
+        classpath 'ly.img.android.pesdk:plugin:'YOUR VERSION HERE''
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$ksp_version")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/settings.gradle b/settings.gradle
@@ -4,6 +4,8 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven { url 'https://artifactory.img.ly/artifactory/imgly' }
+        maven { url 'https://artifactory.img.ly/artifactory/imgly_development' }
+
     }
 }
 rootProject.name = "ImglyTest"