Drop extracted/konan.metadata module
This commit is contained in:
committed by
Dmitriy Dolovov
parent
3a1e33c27b
commit
bbc979fce0
@@ -217,7 +217,6 @@ dependencies {
|
||||
distPack project(':klib')
|
||||
distPack project(path: ':endorsedLibraries:kotlinx.cli', configuration: "jvmRuntimeElements")
|
||||
distPack "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
distPack "org.jetbrains.kotlin:konan.metadata:$konanVersion"
|
||||
distPack "org.jetbrains.kotlin:konan.serializer:$konanVersion"
|
||||
}
|
||||
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
// FIXME(ddol): KLIB-REFACTORING-CLEANUP: drop this module completely!
|
||||
|
||||
buildscript {
|
||||
ext.rootBuildDirectory = file('../..')
|
||||
|
||||
apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
|
||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||
|
||||
dependencies {
|
||||
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8"
|
||||
}
|
||||
}
|
||||
|
||||
String protobufVersion = '2.6.1'
|
||||
apply plugin: "com.google.protobuf"
|
||||
apply plugin: 'java'
|
||||
|
||||
group = 'org.jetbrains.kotlin'
|
||||
version = konanVersion
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
url kotlinCompilerRepo
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
proto.srcDir 'src'
|
||||
java {
|
||||
srcDir 'src'
|
||||
srcDir 'build/renamed/source/proto/main/java'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
archiveName = "${project.name}.jar"
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
url buildKotlinCompilerRepo
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}"
|
||||
compile "com.google.protobuf:protobuf-java:${protobufVersion}"
|
||||
}
|
||||
|
||||
protobuf {
|
||||
protoc {
|
||||
artifact = "com.google.protobuf:protoc:${protobufVersion}"
|
||||
}
|
||||
}
|
||||
|
||||
compileJava {
|
||||
dependsOn('renamePackage')
|
||||
doFirst {
|
||||
delete 'build/generated/source/proto/main/java'
|
||||
}
|
||||
}
|
||||
|
||||
task renamePackage(type: Copy) {
|
||||
dependsOn('generateProto')
|
||||
from 'build/generated/source/proto/main/java'
|
||||
into 'build/renamed/source/proto/main/java'
|
||||
filter {line -> line.replaceAll("com.google.protobuf", "org.jetbrains.kotlin.protobuf")}
|
||||
outputs.dir('build/renamed')
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
rootProject.name = "konan.metadata"
|
||||
@@ -39,5 +39,4 @@ dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
||||
compile "org.jetbrains.kotlin:konan.metadata:$konanVersion"
|
||||
}
|
||||
|
||||
@@ -71,7 +71,6 @@ if (hasProperty("kotlinProjectPath")) {
|
||||
|
||||
includeBuild 'shared'
|
||||
includeBuild 'build-tools'
|
||||
includeBuild 'extracted/konan.metadata'
|
||||
includeBuild 'extracted/konan.serializer'
|
||||
includeBuild 'tools/kotlin-native-gradle-plugin'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user