Depend on kotlin-native-shared from a separate repo

Kotlin-native-shared was copied in a separate repository.
This patch removes this subproject from the K/N repo and
adds a dependency on an artifact built from this separate repo.
This commit is contained in:
Ilya Matveev
2018-10-10 21:12:29 +03:00
committed by Ilya Matveev
parent 575cbf48c3
commit a2370920db
79 changed files with 168 additions and 4156 deletions
@@ -82,6 +82,9 @@ repositories {
maven {
url kotlinCompilerRepo
}
maven {
url sharedRepo
}
}
configurations {
@@ -102,7 +105,8 @@ dependencies {
bundleDependencies "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlinVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$sharedVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-native-version"
testImplementation 'junit:junit:4.12'
testImplementation "org.jetbrains.kotlin:kotlin-test:$buildKotlinVersion"
@@ -1,2 +1,2 @@
rootProject.name = "kotlin-native-gradle-plugin"
includeBuild '../../shared'
includeBuild '../../version'
@@ -24,6 +24,8 @@ import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.Internal
import org.jetbrains.kotlin.gradle.plugin.tasks.KonanArtifactWithLibrariesTask
import org.jetbrains.kotlin.gradle.plugin.tasks.KonanBuildingTask
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.library.SearchPathResolver
import org.jetbrains.kotlin.konan.library.defaultResolver
import org.jetbrains.kotlin.konan.target.Distribution
@@ -146,7 +148,8 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
defaultResolver(
repos.map { it.absolutePath },
task.konanTarget,
Distribution(konanHomeOverride = project.konanHome)
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
)
)
@@ -34,6 +34,7 @@ import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin.Companion.COMPILE_ALL_TASK_NAME
import org.jetbrains.kotlin.gradle.plugin.model.KonanToolingModelBuilder
import org.jetbrains.kotlin.gradle.plugin.tasks.*
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.parseKonanVersion
import org.jetbrains.kotlin.konan.target.HostManager
@@ -25,6 +25,8 @@ import org.gradle.process.CommandLineArgumentProvider
import org.jetbrains.kotlin.gradle.plugin.konan.*
import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifact
import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifactImpl
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.library.defaultResolver
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.Distribution
@@ -234,7 +236,8 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
val resolver = defaultResolver(
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome)
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
)
return KonanModelArtifactImpl(
@@ -27,6 +27,8 @@ import org.jetbrains.kotlin.gradle.plugin.konan.*
import org.jetbrains.kotlin.gradle.plugin.konan.KonanInteropSpec.IncludeDirectoriesSpec
import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifact
import org.jetbrains.kotlin.gradle.plugin.model.KonanModelArtifactImpl
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.library.defaultResolver
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.Distribution
@@ -171,7 +173,8 @@ open class KonanInteropTask @Inject constructor(val workerExecutor: WorkerExecut
val resolver = defaultResolver(
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome)
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
)
return KonanModelArtifactImpl(
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.gradle.plugin.konan.konanArtifactsContainer
import org.jetbrains.kotlin.gradle.plugin.konan.konanExtension
import org.jetbrains.kotlin.gradle.plugin.konan.konanHome
import org.jetbrains.kotlin.gradle.plugin.konan.konanVersion
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import java.io.File
@@ -22,6 +22,7 @@ import org.gradle.testfixtures.ProjectBuilder
import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin
import org.jetbrains.kotlin.gradle.plugin.konan.konanArtifactsContainer
import org.jetbrains.kotlin.gradle.plugin.model.KonanToolingModelBuilder
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.junit.Rule
import org.junit.rules.TemporaryFolder