diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 051b806..0007726 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: gradle: [7.6.3, 8.4] java: [11, 17] agp: [7.4.2, 8.1.2] - kotlin: [1.7.21, 1.8.22, 1.9.10] + kotlin: [1.7.21, 1.8.22, 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,33 @@ 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.22) echo "::set-output name=KSP_VERSION::1.8.22-1.0.11" ;; + 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" ;; + 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 index 93db336..14887d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,9 +2,10 @@ plugins { id 'com.android.application' id 'kotlin-android' id 'ly.img.android.sdk' + id 'com.google.devtools.ksp' } -imglyConfig { +IMGLY.configure { pesdk { enabled true @@ -51,13 +52,13 @@ imglyConfig { } android { - compileSdkVersion 32 + compileSdkVersion 34 namespace "com.imgly.test" defaultConfig { applicationId "com.imgly.test" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/build.gradle b/build.gradle index 0367549..3a7e5fd 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { ext { kotlinVersion = findProperty("kotlinVersion")?.toString() ?: "1.6.21" + ksp_version = findProperty("kspVersion")?.toString() ?: "1.6.21-1.0.6" agpVersion = findProperty("agpVersion")?.toString() ?: "7.1.3" } repositories { @@ -13,7 +14,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:$agpVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'ly.img.android.pesdk:plugin:10.8.0-RC.1' + classpath 'ly.img.android.pesdk:plugin:10.9.0-RC.1' + 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 }