azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of gradle-api artifacts uploaded to and used from JB repo

Browse Source 
Remove redundant Maven dependency to `gradle-api` scoped as provided
This commit is contained in:
Sergey Igushkin
2018-01-16 23:40:17 +03:00
parent d16883deaa
commit 5deb20543f
18 changed files with 9 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -2
View File
@@ -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
libraries/examples/kotlin-gradle-subplugin-example/build.gradle
+1 -1
View File
@@ -20,5 +20,5 @@ dependencies {
compileOnly project(':compiler:cli-common')
compileOnly project(':compiler:cli')
compileOnly "org.jetbrains.kotlin:gradle-api:1.6"
compileOnly gradleApi()
}
libraries/tools/kotlin-allopen/build.gradle
+1 -1
View File
@@ -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")
libraries/tools/kotlin-annotation-processing-maven/pom.xml
-13
View File
@@ -25,13 +25,6 @@
<description>Annotation Processor wrapper for Kotlin Maven plugin</description>
<repositories>
<repository>
<id>jetbrains-utils</id>
<url>http://repository.jetbrains.com/utils</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
@@ -44,12 +37,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>gradle-api</artifactId>
<version>1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle</artifactId>
libraries/tools/kotlin-annotation-processing/build.gradle.kts
+2 -2
View File
@@ -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"))
libraries/tools/kotlin-gradle-plugin-api/build.gradle
+1 -1
View File
@@ -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'
}
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
+1 -1
View File
@@ -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')
}
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore
-2
View File
@@ -1,2 +0,0 @@
build
.gradle
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt
-17
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle
-29
View File
@@ -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'
}
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties
Vendored
-6
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew
Vendored
-164
View File
@@ -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 "$@"
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat
Vendored
-90
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml
-52
View File
@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
<maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
<maven.version>3.0.4</maven.version>
<gradle.api.jar.version>2.3</gradle.api.jar.version>
</properties>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>gradle-api</artifactId>
<packaging>pom</packaging>
<version>${gradle.api.jar.version}</version>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>compile</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>build/libs/gradle-api-${gradle.api.jar.version}.jar</file>
<type>jar</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>utils</id>
<url>http://repository.jetbrains.com/utils</url>
</repository>
</distributionManagement>
</project>
libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle
-1
View File
@@ -1 +0,0 @@
rootProject.name = 'gradle-api'
libraries/tools/kotlin-noarg/build.gradle
+1 -1
View File
@@ -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")
libraries/tools/kotlin-sam-with-receiver/build.gradle
+1 -1
View File
@@ -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")