Skip to content

Commit 833dcb1

Browse files
committed
FIX: workflow build error
1 parent bb631e0 commit 833dcb1

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

.github/workflows/build.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- kotlin-2.0.0
78
pull_request:
89

910
# Allows you to run this workflow manually from the Actions tab
@@ -24,11 +25,11 @@ jobs:
2425
- name: Validate Gradle Wrapper
2526
uses: gradle/wrapper-validation-action@v1
2627

27-
- name: Set up JDK 8
28+
- name: Set up JDK 11
2829
uses: actions/setup-java@v3
2930
with:
3031
distribution: 'zulu'
31-
java-version: 8
32+
java-version: 11
3233

3334
- name: Setup Gradle
3435
uses: gradle/[email protected]
@@ -39,12 +40,6 @@ jobs:
3940
- name: Publish To Local
4041
run: ./gradlew publishToMavenLocal -PVERSION_NAME=0.0.0-SNAPSHOT
4142

42-
- name: Set up JDK 11
43-
uses: actions/setup-java@v3
44-
with:
45-
distribution: 'zulu'
46-
java-version: 11
47-
4843
- name: Check spotless
4944
run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
5045

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
- name: Check out
1616
uses: actions/checkout@v2
1717

18-
- name: Set up JDK 8
18+
- name: Set up JDK 11
1919
uses: actions/setup-java@v2
2020
with:
2121
distribution: 'zulu'
22-
java-version: '8'
22+
java-version: '11'
2323

2424
- name: Build & Publish Kace plugin to Maven Central
2525
run: chmod +x ./publish.sh && ./publish.sh

kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceFirSupertypeGenerationExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class KaceFirSupertypeGenerationExtension(
4949
override fun computeAdditionalSupertypes(
5050
classLikeDeclaration: FirClassLikeDeclaration,
5151
resolvedSupertypes: List<FirResolvedTypeRef>,
52-
typeResolver: TypeResolveService
52+
typeResolver: TypeResolveService,
5353
): List<FirResolvedTypeRef> {
5454
var shouldAddSuperType = false
5555
OUTER@ for (superTypeRef in resolvedSupertypes) {

kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class KaceIrTransformer(private val context: IrPluginContext) : IrElementTransfo
7777
// override fun <T> findViewByIdCached(owner, id) = ...
7878
declaration.addOverride(
7979
ANDROID_EXTENSIONS_FQNAME,
80-
FIND_VIEW_BY_ID_CACHED_NAME
80+
FIND_VIEW_BY_ID_CACHED_NAME,
8181
).apply {
8282
val parameterT = addTypeParameter("T", context.typeOfView())
8383
returnType = parameterT.defaultType.makeNullable()

kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.ir.declarations.IrFunction
2727
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
2828
import org.jetbrains.kotlin.ir.expressions.IrExpression
2929
import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
30-
import org.jetbrains.kotlin.ir.types.IrType
3130
import org.jetbrains.kotlin.ir.types.classOrNull
3231
import org.jetbrains.kotlin.ir.util.allOverridden
3332
import org.jetbrains.kotlin.ir.util.copyTo

0 commit comments

Comments
 (0)