FIX: workflow build error (#65)

kanyun-inc · Dec 15, 2024 · c6445bf · c6445bf
1 parent bb631e0
commit c6445bf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - kotlin-2.0.0
   pull_request:
 
   # Allows you to run this workflow manually from the Actions tab
@@ -24,11 +25,11 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 11
 
       - name: Setup Gradle
         uses: gradle/[email protected]
@@ -39,12 +40,6 @@ jobs:
       - name: Publish To Local
         run: ./gradlew publishToMavenLocal -PVERSION_NAME=0.0.0-SNAPSHOT
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 11
-
       - name: Check spotless
         run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,11 +15,11 @@ jobs:
       - name: Check out
         uses: actions/checkout@v2
 
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '11'
 
       - name: Build & Publish Kace plugin to Maven Central
         run: chmod +x ./publish.sh && ./publish.sh

diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceFirSupertypeGenerationExtension.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceFirSupertypeGenerationExtension.kt
@@ -49,7 +49,7 @@ class KaceFirSupertypeGenerationExtension(
     override fun computeAdditionalSupertypes(
         classLikeDeclaration: FirClassLikeDeclaration,
         resolvedSupertypes: List<FirResolvedTypeRef>,
-        typeResolver: TypeResolveService
+        typeResolver: TypeResolveService,
     ): List<FirResolvedTypeRef> {
         var shouldAddSuperType = false
         OUTER@ for (superTypeRef in resolvedSupertypes) {

diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt
@@ -77,7 +77,7 @@ class KaceIrTransformer(private val context: IrPluginContext) : IrElementTransfo
                 // override fun <T> findViewByIdCached(owner, id) = ...
                 declaration.addOverride(
                     ANDROID_EXTENSIONS_FQNAME,
-                    FIND_VIEW_BY_ID_CACHED_NAME
+                    FIND_VIEW_BY_ID_CACHED_NAME,
                 ).apply {
                     val parameterT = addTypeParameter("T", context.typeOfView())
                     returnType = parameterT.defaultType.makeNullable()

diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
-import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.util.allOverridden
 import org.jetbrains.kotlin.ir.util.copyTo

diff --git a/kace-sample/gradle.properties b/kace-sample/gradle.properties
@@ -28,4 +28,4 @@ kotlin_version = 1.7.0
 kotlin_coroutine_version = 1.6.3
 
 testAgp=false
-agpVersion=4.2.2
+agpVersion=7.1.3
diff --git a/kace-sample/gradle/wrapper/gradle-wrapper.properties b/kace-sample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip