Skip to content

Commit

Permalink
Migrate native to infra
Browse files Browse the repository at this point in the history
  • Loading branch information
orangy committed Feb 27, 2019
1 parent 584ed44 commit da20d4d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fun Project.build(platform: String) = platform(platform, "Build") {
jvmArgs = "-Xmx1g"
tasks = "clean publishToBuildLocal check"
// --continue is needed to run tests for all targets even if one target fails
gradleParams = "-P$versionSuffixParameter=SNAPSHOT -P$teamcitySuffixParameter=%build.counter% --continue"
gradleParams = "--info --stacktrace -P$versionSuffixParameter=SNAPSHOT -P$teamcitySuffixParameter=%build.counter% --continue"
buildFile = ""
gradleWrapperPath = ""
}
Expand Down Expand Up @@ -141,7 +141,7 @@ fun Project.deployConfigure() = BuildType {
gradle {
name = "Verify Gradle Configuration"
tasks = "clean publishBintrayCreateVersion"
gradleParams = "-P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
buildFile = ""
jdkHome = "%env.JDK_18%"
}
Expand Down Expand Up @@ -180,7 +180,7 @@ fun Project.deploy(platform: String, configureBuild: BuildType) = platform(platf
name = "Deploy $platform Binaries"
jdkHome = "%env.JDK_18_x64%"
jvmArgs = "-Xmx1g"
gradleParams = "-P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
tasks = "clean build publish"
buildFile = ""
gradleWrapperPath = ""
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-25"
classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-27"
}
}

Expand Down
33 changes: 4 additions & 29 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
import org.jetbrains.kotlin.konan.target.HostManager
project.ext.hostManager = new HostManager()

apply plugin: 'kotlin-multiplatform'
apply from: rootProject.file("gradle/utility.gradle")

kotlin {
if (project.ext.ideaActive) {
targets {
project.ext.nativeTarget = fromPreset(project.ext.ideaPreset, 'native')
}
} else {
macosX64('macosX64')
linuxX64('linuxX64')
mingwX64('mingwX64')
infra {
target('macosX64')
target('linuxX64')
target('mingwX64')
}

jvm {
Expand Down Expand Up @@ -80,23 +72,6 @@ kotlin {
api 'org.jetbrains.kotlin:kotlin-test-js'
}
}

if (ideaActive) {
nativeMain {
kotlin.srcDir("${project.ext.nativeTarget.preset.name}Main/src")
}
} else {
nativeMain {}
nativeTest {}

configure([linuxX64Main, macosX64Main, mingwX64Main]) {
dependsOn nativeMain
}

configure([linuxX64Test, macosX64Test, mingwX64Main]) {
dependsOn nativeTest
}
}

nativeMain.dependencies {
}
Expand Down
22 changes: 0 additions & 22 deletions gradle/utility.gradle

This file was deleted.

0 comments on commit da20d4d

Please sign in to comment.