From dfdce5ff58e5e3091b0898807b36fcf2509ff644 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 5 Jan 2017 16:33:42 +0300 Subject: [PATCH] Publish to custom local repo, add copy-only reflect and js-lib Add artifact signing --- libraries/build.gradle | 21 +++++++++++++++++++ libraries/settings.gradle | 8 +++---- .../tools/kotlin-js-library/build.gradle | 7 +++++++ libraries/tools/kotlin-reflect/build.gradle | 10 ++++++--- 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 libraries/tools/kotlin-js-library/build.gradle diff --git a/libraries/build.gradle b/libraries/build.gradle index 9c3482cb581..2ab8f621c61 100644 --- a/libraries/build.gradle +++ b/libraries/build.gradle @@ -18,6 +18,7 @@ allprojects { subprojects { apply plugin: 'kotlin' + apply plugin: 'signing' jar { baseName = project.name @@ -49,4 +50,24 @@ subprojects { compileKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar") compileTestKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar") + + signing { + required { project.ext.has('signing.keyId') } + sign configurations.archives + } + + uploadArchives { + repositories { + mavenDeployer { + repository(url: "file://${rootDir}/localRepo") + uniqueVersion = false + pom.version = kotlin_version + pom.project { + groupId = project.group + artifactId = project.name + version = project.version + } + } + } + } } diff --git a/libraries/settings.gradle b/libraries/settings.gradle index 75bb7048b54..ab87b5c8636 100644 --- a/libraries/settings.gradle +++ b/libraries/settings.gradle @@ -1,14 +1,14 @@ rootProject.name = 'kotlin-libraries' include ':kotlin-runtime' include ':kotlin-script-runtime' +include ':kotlin-js-library' include ':kotlin-test-parent' include ':kotlin-test-parent:kotlin-test' include ':kotlin-test-parent:kotlin-test-junit' -include ':kotlin-stdlib-common' +//include ':kotlin-stdlib-common' include ':kotlin-stdlib' include ':kotlin-stdlib-jre7' include ':kotlin-stdlib-jre8' -include ':kotlin-js-library' include ':kotlin-reflect' //include ':kotlin-compiler' @@ -50,14 +50,14 @@ include ':kotlin-reflect' project(':kotlin-runtime').projectDir = "$rootDir/tools/runtime" as File project(':kotlin-script-runtime').projectDir = "$rootDir/tools/script-runtime" as File +project(':kotlin-js-library').projectDir = "$rootDir/tools/kotlin-js-library" as File project(':kotlin-test-parent').projectDir = "$rootDir/kotlin.test" as File project(':kotlin-test-parent:kotlin-test').projectDir = "$rootDir/kotlin.test/shared" as File project(':kotlin-test-parent:kotlin-test-junit').projectDir = "$rootDir/kotlin.test/junit" as File -project(':kotlin-stdlib-common').projectDir = "$rootDir/stdlib/common" as File +//project(':kotlin-stdlib-common').projectDir = "$rootDir/stdlib/common" as File project(':kotlin-stdlib').projectDir = "$rootDir/stdlib" as File project(':kotlin-stdlib-jre7').projectDir = "$rootDir/stdlib/jre7" as File project(':kotlin-stdlib-jre8').projectDir = "$rootDir/stdlib/jre8" as File -project(':kotlin-js-library').projectDir = "$rootDir/tools/kotlin-js-library" as File project(':kotlin-reflect').projectDir = "$rootDir/tools/kotlin-reflect" as File //project(':kotlin-compiler').projectDir = "$rootDir/tools/kotlin-compiler" as File diff --git a/libraries/tools/kotlin-js-library/build.gradle b/libraries/tools/kotlin-js-library/build.gradle new file mode 100644 index 00000000000..c3d08e00d79 --- /dev/null +++ b/libraries/tools/kotlin-js-library/build.gradle @@ -0,0 +1,7 @@ + +description = 'Kotlin JavaScript Library' + +artifacts { + archives file: file("${rootDir}/../dist/kotlinc/lib/kotlin-jslib.jar"), name: project.name, type: 'jar' + archives file: file("${rootDir}/../dist/kotlinc/lib/kotlin-jslib-sources.jar"), name: project.name, classifier: 'sources', type: 'jar' +} diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle index e1ba42ac853..eba94f68d72 100644 --- a/libraries/tools/kotlin-reflect/build.gradle +++ b/libraries/tools/kotlin-reflect/build.gradle @@ -1,5 +1,9 @@ -description = '' -dependencies { - compile project(':kotlin-stdlib') +description = 'Kotlin reflect' + +artifacts { + archives file: file("${rootDir}/../dist/kotlinc/lib/kotlin-reflect.jar"), name: project.name, type: 'jar' + archives file: file("${rootDir}/../dist/kotlin-reflect-sources-for-maven.jar"), name: project.name, classifier: 'sources', type: 'jar' } + +