diff --git a/build.gradle.kts b/build.gradle.kts index 83224ec8ae3..cfe34c31064 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -174,7 +174,6 @@ val gradlePluginProjects = listOf( apply { from("libraries/commonConfiguration.gradle") - from("libraries/gradlePluginsConfiguration.gradle") from("libraries/configureGradleTools.gradle") if (extra["isSonatypeRelease"] as? Boolean == true) { diff --git a/libraries/gradlePluginsConfiguration.gradle b/libraries/gradlePluginsConfiguration.gradle deleted file mode 100644 index d9bd03112c9..00000000000 --- a/libraries/gradlePluginsConfiguration.gradle +++ /dev/null @@ -1,42 +0,0 @@ - -//task clean { -// doLast { -// delete "${buildDir}/repo" -// } -//} - -configure([project(':kotlin-gradle-plugin'), project(':kotlin-allopen'), project(':kotlin-noarg')]) { project -> - apply plugin: 'com.gradle.plugin-publish' - - if (project.hasProperty('publishPluginsVersion')) { - configurations.archives.artifacts.all { - version = project.getProperty('publishPluginsVersion') - } - } - - if (project.hasProperty("${project.name}-jar")) { - println("Using pre-built artifact for ${project.name}") - configurations.archives.artifacts.clear() - - artifacts { - archives(file(project.getProperty("${project.name}-jar"))) { - name project.name - } - } - } - - publishPlugins.doFirst { - assert !kotlinVersion.contains('SNAPSHOT') - } - - pluginBundle { - website = 'https://kotlinlang.org/' - vcsUrl = 'https://github.com/JetBrains/kotlin/' - description = 'Kotlin plugins for Gradle' - tags = ['kotlin'] - - mavenCoordinates { - groupId = "org.jetbrains.kotlin" - } - } -} \ No newline at end of file diff --git a/libraries/tools/gradle-tools/.gitignore b/libraries/tools/gradle-tools/.gitignore deleted file mode 100644 index ac46385db6d..00000000000 --- a/libraries/tools/gradle-tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -classes/ \ No newline at end of file diff --git a/libraries/tools/gradle-tools/build.gradle b/libraries/tools/gradle-tools/build.gradle deleted file mode 100644 index 323faa4339f..00000000000 --- a/libraries/tools/gradle-tools/build.gradle +++ /dev/null @@ -1,61 +0,0 @@ -buildscript { - ext.kotlin_root = "$rootDir/../../.." - apply from: "${kotlin_root}/libraries/versions.gradle" - - repositories { - mavenCentral() - maven { url 'https://plugins.gradle.org/m2/' } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_gradle_plugin_version}" - classpath "com.gradle.publish:plugin-publish-plugin:0.9.7" - } -} - -allprojects { - group = 'org.jetbrains.kotlin' - version = "$kotlin_version" -} - -apply from: "${kotlin_root}/libraries/commonConfiguration.gradle" -apply from: "${kotlin_root}/libraries/configureGradleTools.gradle" - -subprojects { - repositories { - mavenCentral() - } - - tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) { - compilerJarFile = bootstrapCompilerFile - } - - task javadocJar(type: Jar) { - classifier = 'javadoc' - } - - afterEvaluate { - jar { - manifestAttributes(manifest, project) - } - - tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all { task -> - task.kotlinOptions.freeCompilerArgs += ["-module-name", "${project.name}"] - } - - artifacts { - if (tasks.findByName('javadocJar')) { - archives javadocJar - } - if (tasks.findByName('sourcesJar')) { - archives sourcesJar - } - } - } -} - -task clean { - doLast { - delete "${buildDir}/repo" - } -} - diff --git a/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 0e77f2b43a5..00000000000 Binary files a/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 8364dbbca1c..00000000000 --- a/libraries/tools/gradle-tools/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Apr 28 16:02:26 MSK 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/libraries/tools/gradle-tools/gradlew b/libraries/tools/gradle-tools/gradlew deleted file mode 100755 index 4453ccea33d..00000000000 --- a/libraries/tools/gradle-tools/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/libraries/tools/gradle-tools/gradlew.bat b/libraries/tools/gradle-tools/gradlew.bat deleted file mode 100644 index f9553162f12..00000000000 --- a/libraries/tools/gradle-tools/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/libraries/tools/gradle-tools/settings.gradle b/libraries/tools/gradle-tools/settings.gradle deleted file mode 100644 index fac76c79862..00000000000 --- a/libraries/tools/gradle-tools/settings.gradle +++ /dev/null @@ -1,26 +0,0 @@ -include ':kotlin-gradle-plugin-api', - ':kotlin-gradle-plugin', - ':kotlin-gradle-plugin-integration-tests', - ':kotlin-allopen', - ':kotlin-noarg', - ':kotlin-sam-with-receiver', - ':kotlin-gradle-subplugin-example', - - // plugin markers: - ':kotlin-gradle-plugin:plugin-marker', - ':kotlin-allopen:plugin-marker', - ':kotlin-noarg:plugin-marker' - -project(':kotlin-gradle-plugin-api').projectDir = file("../kotlin-gradle-plugin-api") -project(':kotlin-gradle-plugin').projectDir = file("../kotlin-gradle-plugin") -project(':kotlin-gradle-plugin-integration-tests').projectDir = file("../kotlin-gradle-plugin-integration-tests") -project(':kotlin-allopen').projectDir = file("../kotlin-allopen") -project(':kotlin-noarg').projectDir = file("../kotlin-noarg") -project(':kotlin-sam-with-receiver').projectDir = file("../kotlin-sam-with-receiver") -project(':kotlin-gradle-subplugin-example').projectDir = file("../../examples/kotlin-gradle-subplugin-example") - -// plugin markers: -project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("../kotlin-gradle-plugin/plugin-marker") -project(':kotlin-allopen:plugin-marker').projectDir = file("../kotlin-allopen/plugin-marker") -project(':kotlin-noarg:plugin-marker').projectDir = file("../kotlin-noarg/plugin-marker") - diff --git a/libraries/versions.gradle b/libraries/versions.gradle deleted file mode 100644 index caf2f2c0074..00000000000 --- a/libraries/versions.gradle +++ /dev/null @@ -1,3 +0,0 @@ -ext.kotlin_version = findProperty("deployVersion") ?: "1.1-SNAPSHOT" -ext.kotlin_language_version = "1.1" -ext.kotlin_gradle_plugin_version = "1.1.3" \ No newline at end of file