diff --git a/build.gradle b/build.gradle index 1fc3ab3d3c1..758ac989ecc 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/extracted/konan.metadata/build.gradle b/extracted/konan.metadata/build.gradle deleted file mode 100644 index 38441b31401..00000000000 --- a/extracted/konan.metadata/build.gradle +++ /dev/null @@ -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') -} diff --git a/extracted/konan.metadata/settings.gradle b/extracted/konan.metadata/settings.gradle deleted file mode 100644 index 0ed665747b8..00000000000 --- a/extracted/konan.metadata/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "konan.metadata" diff --git a/extracted/konan.serializer/build.gradle b/extracted/konan.serializer/build.gradle index c4dec70b689..05079c6abeb 100644 --- a/extracted/konan.serializer/build.gradle +++ b/extracted/konan.serializer/build.gradle @@ -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" } diff --git a/settings.gradle b/settings.gradle index 149190137a6..c7b177aa7a9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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'