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.

Sign up for GitHub

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

Jump to bottom

Update kotlin monorepo to v1.8.0 #3752

Merged
merged 10 commits into from
Jan 4, 2023
Merged

Update kotlin monorepo to v1.8.0 #3752

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec07b13
Update kotlin monorepo to v1.8.0
renovate[bot] Dec 28, 2022
5df87d9
Update plugin ksp to v1.8.0-1.0.8 (#3753)
renovate[bot] Dec 29, 2022
f9e3772
Update yarn files
hfhbd Dec 29, 2022
0f3d7dc
Workaround for global yarn lock file
hfhbd Dec 29, 2022
d24c417
Fix native compiler cache problem
hfhbd Dec 29, 2022
5cdb34d
Build the runtime of the sample before the sample
hfhbd Dec 29, 2022
d790ab2
Fix linker options
hfhbd Dec 29, 2022
5fdce58
Update gradle.properties
hfhbd Jan 3, 2023
c77e4bd
Update .github/workflows/PR.yml
hfhbd Jan 3, 2023
183cf39
Remove configureOnDemand everywhere
hfhbd Jan 4, 2023
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
10 changes: 8 additions & 2 deletions .github/workflows/PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ jobs:
if: matrix.os == 'macOS-latest' && matrix.job == 'test'
run: ./gradlew iosX64Test --stacktrace

# Build the sample
# Build the sample, drop with 1.8.20:
# https://youtrack.jetbrains.com/issue/KT-52172/Multiplatform-Support-composite-builds
- name: Build the runtime for the sample
if: matrix.os == 'macOS-latest' && matrix.job == 'gradle-plugin-tests'
run: ./gradlew :runtime:assemble

# Build the sample
- name: Build the sample
if: matrix.os == 'macOS-latest' && matrix.job == 'gradle-plugin-tests'
uses: gradle/gradle-build-action@v2
Expand All @@ -101,4 +107,4 @@ jobs:
report_paths: '**/build/test-results/test/TEST-*.xml'

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError -XX:MetaspaceSize=1g"
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError -XX:MetaspaceSize=1g"
hfhbd marked this conversation as resolved.
Show resolved Hide resolved
28 changes: 14 additions & 14 deletions drivers/native-driver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kotlin {
sourceSets {
commonMain {
dependencies {
api project (':runtime')
api project(':runtime')
}
}
commonTest {
Expand All @@ -54,52 +54,52 @@ kotlin {
nativeLinuxLikeMain {
dependsOn(nativeMain)
}
nativeDarwinMain{
nativeDarwinMain {
dependsOn(nativeLinuxLikeMain)
}
mingwMain{
mingwMain {
dependsOn(nativeMain)
}
mingwX86Main{
mingwX86Main {
dependsOn(mingwMain)
}
mingwX64Main{
mingwX64Main {
dependsOn(mingwMain)
}
linuxMain{
linuxMain {
dependsOn(nativeLinuxLikeMain)
}
}

configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX86, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) {
sourceSets.getByName("${name}Main").dependsOn(sourceSets.nativeDarwinMain)
sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest)
compilations.test {
kotlinOptions.freeCompilerArgs += ["-linker-options", "-lsqlite3"]
binaries.configureEach {
linkerOpts += ["-lsqlite3"]
}
}

configure([targets.linuxX64]) {
sourceSets.getByName("${name}Main").dependsOn(sourceSets.linuxMain)
sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest)
compilations.test {
kotlinOptions.freeCompilerArgs += ["-linker-options", "-lsqlite3 -L/usr/lib/x86_64-linux-gnu -L/usr/lib -L/usr/lib64"]
binaries.configureEach {
linkerOpts += ["-lsqlite3", "-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib", "-L/usr/lib64"]
}
}

configure([targets.mingwX64]) {
sourceSets.getByName("${name}Main").dependsOn(sourceSets.mingwMain)
sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest)
compilations.test {
kotlinOptions.freeCompilerArgs += ["-linker-options", "-Lc:\\msys64\\mingw64\\lib -L$rootDir\\libs -lsqlite3".toString()]
binaries.configureEach {
linkerOpts += ["-Lc:\\msys64\\mingw64\\lib", "-L$rootDir\\libs", "-lsqlite3"]
}
}

configure([targets.mingwX86]) {
sourceSets.getByName("${name}Main").dependsOn(sourceSets.mingwMain)
sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest)
compilations.test {
kotlinOptions.freeCompilerArgs += ["-linker-options", "-Lc:\\msys32\\mingw32\\lib -L$rootDir\\libs -lsqlite3".toString()]
binaries.configureEach {
linkerOpts += ["-Lc:\\msys32\\mingw32\\lib", "-L$rootDir\\libs", "-lsqlite3"]
}
}

Expand Down
8 changes: 2 additions & 6 deletions extensions/androidx-paging3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,10 @@ kotlin {
}

configure([targets.iosX64, targets.iosArm64]) {
compilations.test {
kotlinOptions.freeCompilerArgs += ['-linker-options', '-lsqlite3 -L/usr/lib/x86_64-linux-gnu -L/usr/lib -L/usr/lib64']
binaries.configureEach {
linkerOpts += ["-lsqlite3"]
}
}
}

tasks.withType(org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest) {
deviceId = "iPhone 14"
}

apply from: "$rootDir/gradle/gradle-mvn-push.gradle"
8 changes: 4 additions & 4 deletions extensions/coroutines-extensions/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ kotlin {
}

configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX86, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.linuxX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) {
compilations.test {
kotlinOptions.freeCompilerArgs += ['-linker-options', '-lsqlite3 -L/usr/lib/x86_64-linux-gnu -L/usr/lib -L/usr/lib64']
binaries.configureEach {
linkerOpts += ['-lsqlite3', "-L/usr/lib/x86_64-linux-gnu", "-L/usr/lib", "-L/usr/lib64"]
}
}

// mingwX86 target is not supported by kotlinx.coroutines, see https://github.com/Kotlin/kotlinx.coroutines/issues/2157
configure([targets.mingwX64]) {
compilations.test {
kotlinOptions.freeCompilerArgs += ["-linker-options", "-Lc:\\msys64\\mingw64\\lib -L$rootDir\\libs -lsqlite3".toString()]
binaries.configureEach {
linkerOpts += ["-Lc:\\msys64\\mingw64\\lib", "-L$rootDir\\libs", "-lsqlite3"]
}
}

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ kotlin.js.compiler=ir

kotlin.mpp.stability.nowarn=true
kotlin.native.ignoreDisabledTargets=true
kotlin.native.cacheKind=none
dellisd marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "1.7.22"
kotlin = "1.8.0"
dokka = "1.7.20"
kotlinCoroutines = "1.6.4"
idea = "211.7628.21" # Android Studio Bumblebee (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html)
Expand Down Expand Up @@ -98,4 +98,4 @@ publish = { id = "com.vanniktech.maven.publish", version = "0.20.0" }
spotless = { id = "com.diffplug.spotless", version = "6.12.0" }
changelog = { id = "org.jetbrains.changelog", version = "2.0.0" }
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
ksp = { id = "com.google.devtools.ksp", version = "1.7.22-1.0.8" }
ksp = { id = "com.google.devtools.ksp", version = "1.8.0-1.0.8" }
32 changes: 16 additions & 16 deletions kotlin-js-store/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ acorn-import-assertions@^1.7.6:
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==

acorn@^8.4.1:
version "8.7.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
acorn@^8.7.1:
version "8.8.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==

ajv-keywords@^3.5.2:
version "3.5.2"
Expand Down Expand Up @@ -643,10 +643,10 @@ engine.io@~6.2.0:
engine.io-parser "~5.0.3"
ws "~8.2.3"

enhanced-resolve@^5.9.3:
version "5.10.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
enhanced-resolve@^5.10.0:
version "5.12.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
Expand Down Expand Up @@ -1805,7 +1805,7 @@ void-elements@^2.0.0:
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=

watchpack@^2.3.1:
watchpack@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
Expand Down Expand Up @@ -1851,21 +1851,21 @@ webpack-sources@^3.2.3:
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

webpack@5.73.0:
version "5.73.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
webpack@5.74.0:
version "5.74.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^0.0.51"
"@webassemblyjs/ast" "1.11.1"
"@webassemblyjs/wasm-edit" "1.11.1"
"@webassemblyjs/wasm-parser" "1.11.1"
acorn "^8.4.1"
acorn "^8.7.1"
acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
enhanced-resolve "^5.9.3"
enhanced-resolve "^5.10.0"
es-module-lexer "^0.9.0"
eslint-scope "5.1.1"
events "^3.2.0"
Expand All @@ -1878,7 +1878,7 @@ webpack@5.73.0:
schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
watchpack "^2.3.1"
watchpack "^2.4.0"
webpack-sources "^3.2.3"

which@^1.2.1:
Expand Down
Loading