Skip to content

Commit e8e018b

Browse files
committed
fix: wrong circleci config
1 parent 357aa74 commit e8e018b

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ orbs:
1010

1111
# Define a job to be invoked later in a workflow.
1212
# See: https://circleci.com/docs/configuration-reference/#jobs
13+
# ref: https://circleci.com/docs/guides/execution-managed/using-macos/
1314
jobs:
1415
build-android:
1516
executor: java17
@@ -29,8 +30,8 @@ jobs:
2930

3031
build-ios:
3132
macos:
32-
xcode: 15.0.0
33-
resource_class: medium
33+
xcode: 16.4.0
34+
resource_class: macos.m1.medium.gen1
3435
steps:
3536
- checkout
3637
- run:

convention-plugins/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@ plugins {
44

55
repositories {
66
gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
7+
}
8+
9+
java {
10+
toolchain {
11+
languageVersion.set(JavaLanguageVersion.of(8))
12+
}
713
}

kotlin-json-patch/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2+
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
23

34
plugins {
45
alias(libs.plugins.kotlinMultiplatform)
@@ -21,6 +22,7 @@ kotlin {
2122
androidTarget {
2223
compilerOptions {
2324
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
25+
jvmDefault = JvmDefaultMode.DISABLE
2426
}
2527
publishLibraryVariants("release", "debug")
2628
}

0 commit comments

Comments
 (0)