Compare commits
4 Commits
master
...
kotlin-1.6
Author | SHA1 | Date | |
---|---|---|---|
|
b4058925ee | ||
|
1fe019da21 | ||
|
119fe49bbe | ||
|
45a03716ee |
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -11,11 +11,11 @@ jobs:
|
|||||||
timeout-minutes: 40
|
timeout-minutes: 40
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3.0.0
|
||||||
- uses: actions/setup-java@v2.5.0
|
- uses: actions/setup-java@v3.0.0
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 11
|
||||||
distribution: liberica
|
distribution: liberica
|
||||||
- uses: gradle/gradle-build-action@v2
|
- uses: gradle/gradle-build-action@v2.1.5
|
||||||
with:
|
with:
|
||||||
arguments: build
|
arguments: build
|
||||||
|
6
.github/workflows/publish.yml
vendored
6
.github/workflows/publish.yml
vendored
@ -11,12 +11,12 @@ jobs:
|
|||||||
timeout-minutes: 40
|
timeout-minutes: 40
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3.0.0
|
||||||
- uses: actions/setup-java@v2.5.0
|
- uses: actions/setup-java@v3.0.0
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 11
|
||||||
distribution: liberica
|
distribution: liberica
|
||||||
- uses: gradle/gradle-build-action@v2
|
- uses: gradle/gradle-build-action@v2.1.5
|
||||||
with:
|
with:
|
||||||
arguments: |
|
arguments: |
|
||||||
publishAllPublicationsToSpaceRepository
|
publishAllPublicationsToSpaceRepository
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[versions]
|
[versions]
|
||||||
tools = "0.11.2-kotlin-1.6.10"
|
tools = "0.11.2-kotlin-1.6.20"
|
||||||
kotlin = "1.6.10"
|
kotlin = "1.6.20"
|
||||||
atomicfu = "0.17.1"
|
atomicfu = "0.17.1"
|
||||||
binary-compatibility-validator = "0.8.0"
|
binary-compatibility-validator = "0.8.0"
|
||||||
changelog = "1.3.1"
|
changelog = "1.3.1"
|
||||||
@ -15,10 +15,10 @@ kotlinx-html = "0.7.3"
|
|||||||
kotlinx-knit = "0.3.0"
|
kotlinx-knit = "0.3.0"
|
||||||
kotlinx-nodejs = "0.0.7"
|
kotlinx-nodejs = "0.0.7"
|
||||||
kotlinx-serialization = "1.3.2"
|
kotlinx-serialization = "1.3.2"
|
||||||
ktor = "1.6.7"
|
ktor = "1.6.8"
|
||||||
xmlutil = "0.84.0"
|
xmlutil = "0.84.1"
|
||||||
yamlkt = "0.10.2"
|
yamlkt = "0.10.2"
|
||||||
jsBom = "0.0.1-pre.313-kotlin-1.6.10"
|
jsBom = "0.0.1-pre.325-kotlin-1.6.10"
|
||||||
junit = "5.8.2"
|
junit = "5.8.2"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -44,7 +44,7 @@ public fun Project.configureKScience(
|
|||||||
tasks.withType<KotlinJvmCompile> {
|
tasks.withType<KotlinJvmCompile> {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
||||||
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
|
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs + "-Xcontext-receivers"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,6 +141,14 @@ public fun Project.configureKScience(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
targets.all {
|
||||||
|
compilations.all {
|
||||||
|
kotlinOptions {
|
||||||
|
freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sourceSets.all {
|
sourceSets.all {
|
||||||
languageSettings.applySettings(kotlinVersion)
|
languageSettings.applySettings(kotlinVersion)
|
||||||
}
|
}
|
||||||
|
@ -25,6 +25,8 @@ internal fun LanguageSettingsBuilder.applySettings(
|
|||||||
optIn("kotlin.time.ExperimentalTime")
|
optIn("kotlin.time.ExperimentalTime")
|
||||||
optIn("kotlin.contracts.ExperimentalContracts")
|
optIn("kotlin.contracts.ExperimentalContracts")
|
||||||
optIn("kotlin.js.ExperimentalJsExport")
|
optIn("kotlin.js.ExperimentalJsExport")
|
||||||
|
|
||||||
|
enableLanguageFeature("ContextReceivers")
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun RepositoryHandler.applyRepos() {
|
internal fun RepositoryHandler.applyRepos() {
|
||||||
|
Loading…
Reference in New Issue
Block a user