Skip to content

Commit 464b42a

Browse files
project compiles now
1 parent 27eff17 commit 464b42a

8 files changed

Lines changed: 27 additions & 25 deletions

File tree

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
buildscript {
2+
val kotlinVersion: String by project
3+
24
repositories {
35
gradlePluginPortal()
46
google()
57
mavenCentral()
68
}
79
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
10+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
911
classpath("com.android.tools.build:gradle:7.2.0-alpha06")
10-
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.31")
12+
classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
1113
}
1214
}
1315

@@ -18,6 +20,8 @@ allprojects {
1820
}
1921
}
2022

21-
//tasks.register("clean", Delete::class) {
22-
// delete(rootProject.buildDir)
23-
//}
23+
// On Apple Silicon we need Node.js 16.0.0
24+
// https://youtrack.jetbrains.com/issue/KT-49109
25+
rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) {
26+
rootProject.the(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class).nodeVersion = "16.0.0"
27+
}

project-files/Portfolio/buildSrc/src/main/java/io/github/amanshuraikwar/nxtbuz/buildSrc/dependencies.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package io.github.amanshuraikwar.nxtbuz.buildSrc
44

55
object Libs {
6-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
76
const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.4"
87

98
const val multiplatformSettings = "com.russhwolf:multiplatform-settings:0.8.1"
@@ -49,9 +48,8 @@ object Libs {
4948
}
5049

5150
object Kotlin {
52-
private const val version = "1.6.0"
51+
private const val version = "1.6.10"
5352
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
54-
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
5553
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
5654
}
5755

project-files/Portfolio/gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
55
kotlin.code.style=official
66

77
#Android
8-
android.useAndroidX=true
8+
android.useAndroidX=true
9+
10+
# Kotlin/Native clients can override this through updating common.podspec
11+
kotlinVersion=1.6.10

project-files/Portfolio/iosApp/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../shared"
1010

1111
SPEC CHECKSUMS:
12-
shared: 7e5bb3963fe6bd4de6f2c4da301b5f6251f84201
12+
shared: 7b4d6aa8aa7ada5f9dae3229e2524d316cb9f063
1313

1414
PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
1515

project-files/Portfolio/iosApp/Pods/Local Podspecs/shared.podspec.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project-files/Portfolio/iosApp/Pods/Manifest.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project-files/Portfolio/iosApp/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

project-files/Portfolio/shared/shared.podspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ Pod::Spec.new do |spec|
3535
"$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
3636
-Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
3737
-Pkotlin.native.cocoapods.archs="$ARCHS" \
38-
-Pkotlin.native.cocoapods.configuration=$CONFIGURATION \
39-
-Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \
40-
-Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \
41-
-Pkotlin.native.cocoapods.paths.frameworks="$FRAMEWORK_SEARCH_PATHS"
38+
-Pkotlin.native.cocoapods.configuration=$CONFIGURATION
4239
SCRIPT
4340
}
4441
]

0 commit comments

Comments
 (0)