File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -35,3 +35,9 @@ allprojects {
3535 }
3636 }
3737}
38+
39+ // Workaround for https://youtrack.jetbrains.com/issue/KT-49109 that allows building on Apple Silicon
40+ // This should no longer be needed with Kotlin version 1.6.20
41+ rootProject.plugins.withType< org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin > {
42+ rootProject.the< org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension > ().nodeVersion = " 16.0.0"
43+ }
Original file line number Diff line number Diff line change @@ -25,8 +25,10 @@ kotlin {
2525 }
2626 js().browser()
2727 iosX64()
28+ macosArm64()
2829 iosArm32()
2930 iosArm64()
31+ iosSimulatorArm64()
3032 macosX64()
3133
3234 sourceSets {
@@ -82,6 +84,14 @@ kotlin {
8284 dependsOn(appleTest)
8385 }
8486
87+ val macosArm64Main by getting {
88+ dependsOn(appleMain)
89+ }
90+
91+ val macosArm64Test by getting {
92+ dependsOn(appleTest)
93+ }
94+
8595 val iosX64Main by getting {
8696 dependsOn(appleMain)
8797 }
@@ -106,6 +116,13 @@ kotlin {
106116 dependsOn(appleTest)
107117 }
108118
119+ val iosSimulatorArm64Main by getting {
120+ dependsOn(appleMain)
121+ }
122+ val iosSimulatorArm64Test by getting {
123+ dependsOn(appleTest)
124+ }
125+
109126 all {
110127 languageSettings.enableLanguageFeature(" InlineClasses" )
111128 }
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ android-min = "21"
44atomicfu = " 0.17.1"
55coroutines = " 1.6.0"
66kotlin = " 1.6.10"
7- tuulbox = " 6.0.1 "
7+ tuulbox = " 6.1.0 "
88
99[libraries ]
1010androidx-startup = { module = " androidx.startup:startup-runtime" , version = " 1.1.1" }
You can’t perform that action at this time.
0 commit comments