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

Add support for Kotlin/Native in protocol #1003

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ on:

jobs:
build:
runs-on: ubuntu-latest
# TODO: revert to ubuntu once https://youtrack.jetbrains.com/issue/KT-52666/ gets fixed
runs-on: macos-latest
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ build/*
/plugin-api/out/
/protocol/build/
/protocol/out/
gradle.properties
application.yml
LavalinkServer/plugins
.cache/
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import com.vanniktech.maven.publish.MavenPublishBaseExtension
import com.vanniktech.maven.publish.SonatypeHost
import org.ajoberstar.grgit.Grgit
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.jetbrains.dokka") version "1.8.20" apply false
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kotlin.native.ignoreDisabledTargets=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
473 changes: 237 additions & 236 deletions kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions protocol/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,26 @@ kotlin {
}
}

linuxX64()
linuxArm64()

mingwX64()

macosX64()
macosArm64()

iosArm64()
iosX64()
iosSimulatorArm64()

watchosX64()
watchosArm64()
watchosSimulatorArm64()

tvosX64()
tvosArm64()
tvosSimulatorArm64()

sourceSets {
all {
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
Expand Down