azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildScriptManipulator: implement new syntax for enable experimental features in MPP

Browse Source 
#KT-28295 Fixed
This commit is contained in:
Dmitry Gridin
2019-07-15 18:34:43 +03:00
parent 8887031962
commit cb432acfb7
13 changed files with 120 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/gradle/configurator/disableFeatureSupportMultiplatform/build.gradle.after
Vendored
+3 -5
View File
@@ -15,11 +15,6 @@ repositories {
kotlin {
targets {
fromPreset(presets.jvm, 'jvm')
configure([jvm]) {
tasks.getByName(compilations.main.compileKotlinTaskName).kotlinOptions {
freeCompilerArgs = ["-XXLanguage:-InlineClasses"]
}
}
}
sourceSets {
commonMain {
@@ -32,5 +27,8 @@ kotlin {
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
}
}
all {
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatform/build.gradle.after
Vendored
+3 -5
View File
@@ -15,11 +15,6 @@ repositories {
kotlin {
targets {
fromPreset(presets.jvm, 'jvm')
configure([jvm]) {
tasks.getByName(compilations.main.compileKotlinTaskName).kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
}
}
}
sourceSets {
commonMain {
@@ -32,5 +27,8 @@ kotlin {
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
}
}
all {
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithDots/build.gradle → idea/testData/gradle/configurator/enableFeatureSupportMultiplatform2/build.gradle
Vendored
+4 -2
View File
@@ -7,13 +7,15 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
}
}
apply plugin: "kotlin-multiplatform"
plugins {
id 'org.jetbrains.kotlin.multiplatform' version '1.3.41'
}
repositories {
jcenter()
mavenCentral()
}
kotlin {
targets.fromPreset(presets.jvm, 'jvm')
jvm()
sourceSets {
commonMain {
dependencies {
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithDots/build.gradle.after → idea/testData/gradle/configurator/enableFeatureSupportMultiplatform2/build.gradle.after
Vendored
+6 -8
View File
@@ -7,13 +7,15 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
}
}
apply plugin: "kotlin-multiplatform"
plugins {
id 'org.jetbrains.kotlin.multiplatform' version '1.3.41'
}
repositories {
jcenter()
mavenCentral()
}
kotlin {
targets.fromPreset(presets.jvm, 'jvm')
jvm()
sourceSets {
commonMain {
dependencies {
@@ -25,12 +27,8 @@ kotlin {
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
}
}
}
targets {
configure([jvm]) {
tasks.getByName(compilations.main.compileKotlinTaskName).kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
}
all {
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformKts/build.gradle.kts
Vendored
+16
View File
@@ -0,0 +1,16 @@
plugins {
kotlin("multiplatform") version "1.3.41"
}
repositories {
mavenCentral()
}
group = "com.example"
version = "0.0.1"
kotlin {
sourceSets {
val commonMain by getting
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformKts/build.gradle.kts.after
Vendored
+19
View File
@@ -0,0 +1,19 @@
plugins {
kotlin("multiplatform") version "1.3.41"
}
repositories {
mavenCentral()
}
group = "com.example"
version = "0.0.1"
kotlin {
sourceSets {
val commonMain by getting
all {
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformToExistentArguments/build.gradle
Vendored
+3 -8
View File
@@ -13,14 +13,6 @@ repositories {
mavenCentral()
}
kotlin {
targets {
fromPreset(presets.jvm, 'jvm')
configure([jvm]) {
tasks.getByName(compilations.main.compileKotlinTaskName).kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions"]
}
}
}
sourceSets {
commonMain {
dependencies {
@@ -32,5 +24,8 @@ kotlin {
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
}
}
all {
languageSettings.enableLanguageFeature("SamConversionForKotlinFunctions")
}
}
}
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformToExistentArguments/build.gradle.after
Vendored
+4 -8
View File
@@ -13,14 +13,6 @@ repositories {
mavenCentral()
}
kotlin {
targets {
fromPreset(presets.jvm, 'jvm')
configure([jvm]) {
tasks.getByName(compilations.main.compileKotlinTaskName).kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions", "-XXLanguage:+InlineClasses"]
}
}
}
sourceSets {
commonMain {
dependencies {
@@ -32,5 +24,9 @@ kotlin {
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
}
}
all {
languageSettings.enableLanguageFeature("SamConversionForKotlinFunctions")
languageSettings.enableLanguageFeature("InlineClasses")
}
}
}