Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: workflow build error #65

Merged
merged 1 commit into from
Dec 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kace-sample/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion kace-sample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading