diff --git a/build.gradle.kts b/build.gradle.kts index 964ce608a9f..7835fac9e6c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,7 @@ buildscript { val repos = listOfNotNull( bootstrapKotlinRepo, "https://jcenter.bintray.com/", - "https://plugins.gradle.org/m2", - "http://repository.jetbrains.com/utils/") + "https://plugins.gradle.org/m2") extra["repos"] = repos diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index 0128ab8d891..fc38f45eeeb 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -20,5 +20,5 @@ dependencies { compileOnly project(':compiler:cli-common') compileOnly project(':compiler:cli') - compileOnly "org.jetbrains.kotlin:gradle-api:1.6" + compileOnly gradleApi() } \ No newline at end of file diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle index 11460392f32..d959ec42f01 100644 --- a/libraries/tools/kotlin-allopen/build.gradle +++ b/libraries/tools/kotlin-allopen/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar') compileOnly project(':kotlin-allopen-compiler-plugin') - compileOnly 'org.jetbrains.kotlin:gradle-api:1.6' + compileOnly gradleApi() } evaluationDependsOn(":kotlin-allopen-compiler-plugin") diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index 3d3014cd678..63bafe347db 100755 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml @@ -25,13 +25,6 @@ Annotation Processor wrapper for Kotlin Maven plugin - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - org.jetbrains.kotlin @@ -44,12 +37,6 @@ ${project.version} provided - - org.jetbrains.kotlin - gradle-api - 1.6 - provided - com.android.tools.build gradle diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index 2c848445d7a..cf4be64f3e1 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -11,8 +11,8 @@ val packedJars by configurations.creating dependencies { compile(projectDist(":kotlin-stdlib")) compileOnly(project(":kotlin-annotation-processing")) - compileOnly("org.jetbrains.kotlin:gradle-api:1.6") - testCompile("org.jetbrains.kotlin:gradle-api:1.6") + compileOnly(gradleApi()) + testCompile(gradleApi()) compileOnly("com.android.tools.build:gradle:1.1.0") testCompile("com.android.tools.build:gradle:1.1.0") testCompile(commonDep("junit:junit")) diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle b/libraries/tools/kotlin-gradle-plugin-api/build.gradle index b8059718ad6..d1c15e9a22b 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle @@ -12,7 +12,7 @@ repositories { dependencies { compile project(':kotlin-stdlib') - compileOnly 'org.jetbrains.kotlin:gradle-api:1.6' + compileOnly gradleApi() compileOnly 'com.android.tools.build:gradle:0.4.2' } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle index 7c5555dcbab..9c472a7dd64 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle @@ -23,7 +23,7 @@ dependencies { testCompile project(path: ':kotlin-build-common', configuration: 'tests-jar') testCompile project(path: ':compiler:incremental-compilation-impl', configuration: 'tests-jar') - testCompile 'org.jetbrains.kotlin:gradle-api:2.2' + testCompile gradleApi() testRuntime project(path: ':kotlin-android-extensions', configuration: 'runtimeJar') } diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore deleted file mode 100644 index 91ea7410d89..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt deleted file mode 100644 index f40cac593ca..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -Updating version of gradle-api.jar - - * change version in build.gradle file - - * change gradle.api.jar.version in pom.xml - - * run command: gradlew wrapper - - * deploy gradle api to maven - -Deploying gradle api to maven - - * gradlew build - -> build/libs/gradle-api-1.6.jar - - * mvn deploy - build/libs/gradle-api-1.6.jar -> http://repository.jetbrains.com/utils diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle deleted file mode 100644 index a58b68a1bde..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -apply plugin: 'java' -apply plugin: 'maven' - -version = '2.3' -group = 'org.jetbrains.kotlin' - - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - compile gradleApi() -} - - -jar { - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } - exclude('META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA') -} - -artifacts { - archives jar -} - -task wrapper(type: Wrapper) { - gradleVersion = '2.3' -} diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 085a1cdc27d..00000000000 Binary files a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 49f546a74cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Apr 22 16:22:48 MSK 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew deleted file mode 100644 index 91a7e269e19..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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 -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -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" ] ; 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"` - - # 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat deleted file mode 100644 index 8a0b282aa68..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat +++ /dev/null @@ -1,90 +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 - -@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= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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 Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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/kotlin-gradle-plugin/gradle_api_jar/pom.xml b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml deleted file mode 100644 index 02943aeee6f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - 1.4.1 - 3.0.4 - 2.3 - - - org.jetbrains.kotlin - gradle-api - pom - ${gradle.api.jar.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - compile - - attach-artifact - - - - - build/libs/gradle-api-${gradle.api.jar.version}.jar - jar - - - - - - - - - - - - utils - http://repository.jetbrains.com/utils - - - - diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle deleted file mode 100644 index 1b5ae8f8d26..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'gradle-api' diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 9cd87e93131..b00ffe264f1 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -22,7 +22,7 @@ dependencies { compileOnly project(':compiler') compileOnly project(':kotlin-noarg-compiler-plugin') - compileOnly 'org.jetbrains.kotlin:gradle-api:1.6' + compileOnly gradleApi() } evaluationDependsOn(":kotlin-noarg-compiler-plugin") diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 6f636578f6c..c2173619e30 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -22,7 +22,7 @@ dependencies { compileOnly project(':compiler') compileOnly project(':kotlin-sam-with-receiver-compiler-plugin') - compileOnly 'org.jetbrains.kotlin:gradle-api:1.6' + compileOnly gradleApi() } evaluationDependsOn(":kotlin-sam-with-receiver-compiler-plugin")