From 0c085cd0a2570c9fbfbd8fb86533f903202f503e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 30 Aug 2017 17:16:54 +0300 Subject: [PATCH] Remove gradle files from obsolete gradle build parts --- libraries/build.gradle | 54 -------------------- libraries/settings.gradle | 102 -------------------------------------- settings.gradle | 9 ---- 3 files changed, 165 deletions(-) delete mode 100644 libraries/build.gradle delete mode 100644 libraries/settings.gradle diff --git a/libraries/build.gradle b/libraries/build.gradle deleted file mode 100644 index 227c9240ba7..00000000000 --- a/libraries/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -buildscript { - ext.kotlin_root = "$rootDir/.." - apply from: 'versions.gradle' - - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_gradle_plugin_version}" - } -} - -allprojects { - group = 'org.jetbrains.kotlin' - version = "$kotlin_version" -} - -apply from: 'commonConfiguration.gradle' - -subprojects { - - repositories { - mavenCentral() - } - - configurations { - scriptCompile - scriptRuntime.extendsFrom(scriptCompile) - } - - dependencies { - scriptCompile "org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlin_gradle_plugin_version}" - } - - tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) { - compilerJarFile = bootstrapCompilerFile - } - - task javadocJar(type: Jar) { - classifier = 'javadoc' - } - -} - -task clean { - doLast { - delete "${buildDir}/repo" - } -} - -if (isSonatypeRelease) { - println 'Applying configuration for sonatype release' - apply from: 'prepareSonatypeStaging.gradle' -} \ No newline at end of file diff --git a/libraries/settings.gradle b/libraries/settings.gradle deleted file mode 100644 index 31baae8cf5e..00000000000 --- a/libraries/settings.gradle +++ /dev/null @@ -1,102 +0,0 @@ -rootProject.name = 'kotlin-libraries' -include ':kotlin-runtime' -include ':kotlin-script-runtime' -include ':kotlin-test' -include ':kotlin-test:kotlin-test-common' -include ':kotlin-test:kotlin-test-jvm' -include ':kotlin-test:kotlin-test-junit' -include ':kotlin-test:kotlin-test-js' -include ':kotlin-test:kotlin-test-js:kotlin-test-js-it' -include ':kotlin-stdlib-common' -include ':kotlin-stdlib' -include ':kotlin-stdlib-js' -include ':kotlin-stdlib-jre7' -include ':kotlin-stdlib-jre8' -include ':kotlin-stdlib:samples' -include ':tools:binary-compatibility-validator' -include ':tools:kotlin-stdlib-js-merger' -include ':tools:kotlin-stdlib-gen' -include ':tools:protobuf-lite' -include ':kotlin-reflect' - -//include ':kotlin-compiler' -//include ':kotlin-compiler-embeddable' -//include ':native-platform' -//include ':kotlin-compiler-runner' -//include ':kotlin-daemon-client' -//include ':kotlin-build-common-test' -//include ':kotlin-maven-plugin' -//include ':kotlin-osgi-bundle' -//include ':kotlin-archetypes-parent:kotlin-archetype-jvm' -//include ':kotlin-archetypes-parent:kotlin-archetype-js' -//include ':kotlin-archetypes-parent' -//include ':idl2k' -//include ':kotlin-annotation-processing' -//include ':kotlin-allopen' -//include ':kotlin-maven-allopen' -//include ':kotlin-noarg' -//include ':kotlin-maven-noarg' -//include ':kotlin-gradle-plugin' -//include ':kotlin-gradle-plugin-api' -//include ':kotlin-android-extensions' -//include ':kotlin-maven-plugin-test' -//include ':kotlin-script-util' -//include ':annotation-processor-example' -//include ':kotlin-java-example' -//include ':js-example' -//include ':kotlin-js-library-example' -//include ':kotlin-gradle-subplugin-example' -//include ':browser-example' -//include ':browser-example-with-library' -//include ':kotlin-jsr223-local-example' -//include ':kotlin-jsr223-daemon-local-eval-example' -//include ':kotlin-gradle-plugin-integration-tests' - -project(':kotlin-runtime').projectDir = "$rootDir/tools/runtime" as File -project(':kotlin-script-runtime').projectDir = "$rootDir/tools/script-runtime" as File -project(':kotlin-test').projectDir = "$rootDir/kotlin.test" as File -project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/kotlin.test/common" as File -project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/kotlin.test/jvm" as File -project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/kotlin.test/junit" as File -project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/kotlin.test/js" as File -project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/kotlin.test/js/it" as File -project(':kotlin-stdlib-common').projectDir = "$rootDir/stdlib/common" as File -project(':kotlin-stdlib').projectDir = "$rootDir/stdlib" as File -project(':kotlin-stdlib-js').projectDir = "$rootDir/stdlib/js" as File -project(':kotlin-stdlib-jre7').projectDir = "$rootDir/stdlib/jre7" as File -project(':kotlin-stdlib-jre8').projectDir = "$rootDir/stdlib/jre8" as File -project(':kotlin-stdlib:samples').projectDir = "$rootDir/stdlib/samples" as File -project(':kotlin-reflect').projectDir = "$rootDir/tools/kotlin-reflect" as File - -//project(':kotlin-compiler').projectDir = "$rootDir/tools/kotlin-compiler" as File -//project(':kotlin-compiler-embeddable').projectDir = "$rootDir/tools/kotlin-compiler-embeddable" as File -//project(':native-platform').projectDir = "$rootDir/tools/native-platform" as File -//project(':kotlin-compiler-runner').projectDir = "$rootDir/tools/kotlin-compiler-runner" as File -//project(':kotlin-daemon-client').projectDir = "$rootDir/tools/kotlin-daemon-client" as File -//project(':kotlin-build-common-test').projectDir = "$rootDir/tools/kotlin-build-common-test" as File -//project(':kotlin-maven-plugin').projectDir = "$rootDir/tools/kotlin-maven-plugin" as File -//project(':kotlin-osgi-bundle').projectDir = "$rootDir/tools/kotlin-osgi-bundle" as File -//project(':kotlin-archetypes-parent:kotlin-archetype-jvm').projectDir = "$rootDir/tools/maven-archetypes/kotlin-archetype-jvm" as File -//project(':kotlin-archetypes-parent:kotlin-archetype-js').projectDir = "$rootDir/tools/maven-archetypes/kotlin-archetype-js" as File -//project(':kotlin-archetypes-parent').projectDir = "$rootDir/tools/maven-archetypes" as File -//project(':idl2k').projectDir = "$rootDir/tools/idl2k" as File -//project(':kotlin-annotation-processing').projectDir = "$rootDir/tools/kotlin-annotation-processing" as File -//project(':kotlin-allopen').projectDir = "$rootDir/tools/kotlin-allopen" as File -//project(':kotlin-maven-allopen').projectDir = "$rootDir/tools/kotlin-maven-allopen" as File -//project(':kotlin-noarg').projectDir = "$rootDir/tools/kotlin-noarg" as File -//project(':kotlin-maven-noarg').projectDir = "$rootDir/tools/kotlin-maven-noarg" as File -//project(':kotlin-gradle-plugin').projectDir = "$rootDir/tools/kotlin-gradle-plugin" as File -//project(':kotlin-gradle-plugin-api').projectDir = "$rootDir/tools/kotlin-gradle-plugin-api" as File -//project(':kotlin-android-extensions').projectDir = "$rootDir/tools/kotlin-android-extensions" as File -//project(':kotlin-maven-plugin-test').projectDir = "$rootDir/tools/kotlin-maven-plugin-test" as File -//project(':kotlin-script-util').projectDir = "$rootDir/tools/kotlin-script-util" as File -//project(':annotation-processor-example').projectDir = "$rootDir/examples/annotation-processor-example" as File -//project(':kotlin-java-example').projectDir = "$rootDir/examples/kotlin-java-example" as File -//project(':js-example').projectDir = "$rootDir/examples/js-example" as File -//project(':kotlin-js-library-example').projectDir = "$rootDir/examples/kotlin-js-library-example" as File -//project(':kotlin-gradle-subplugin-example').projectDir = "$rootDir/examples/kotlin-gradle-subplugin-example" as File -//project(':browser-example').projectDir = "$rootDir/examples/browser-example" as File -//project(':browser-example-with-library').projectDir = "$rootDir/examples/browser-example-with-library" as File -//project(':kotlin-jsr223-local-example').projectDir = "$rootDir/examples/kotlin-jsr223-local-example" as File -//project(':kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/examples/kotlin-jsr223-daemon-local-eval-example" as File -//project(':kotlin-gradle-plugin-integration-tests').projectDir = "$rootDir/tools/kotlin-gradle-plugin-integration-tests" as File \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e28ec212d9a..f98a54b6d8a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,6 @@ pluginManagement { } // modules -//include ":buildSrc" // this fixes import into idea, so buildsrc is not longer imported with different gradle version include ":kotlin-build-common", ":compiler", ":compiler:util", @@ -180,11 +179,3 @@ project(':kotlin-annotation-processing').projectDir = "$rootDir/libraries/tools/ project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File -def setBuildFile(ProjectDescriptor project) { - if (project.projectDir.listFiles().any { file -> file.name == "build.gradle.kts"}) { - project.buildFileName = "build.gradle.kts" - } - project.children.each { p -> setBuildFile(p) } -} - -setBuildFile(rootProject)