From 2bd7a4ac79bfa813a0c19bdcd417c44039b38480 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Tue, 14 Jul 2015 17:27:47 +0300 Subject: Build fatjar by gradle and use it's output as dependency for maven and gradle plugins. Eliminate local repository in out dir. --- .idea/gradle.xml | 11 ++ .idea/libraries/Gradle__junit_junit_4_12.xml | 4 +- .../Gradle__org_fusesource_jansi_jansi_1_11.xml | 6 +- .../Gradle__org_hamcrest_hamcrest_core_1_3.xml | 6 +- ...jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml | 12 ++ ...radle__org_jetbrains_dokka_dokka_fatjar_1_0.xml | 10 -- ...ns_kotlin_kotlin_gradle_plugin_0_1_SNAPSHOT.xml | 12 -- ...otlin_kotlin_gradle_plugin_api_0_1_SNAPSHOT.xml | 12 -- ...etbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml | 12 -- ...jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml | 12 -- ...jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml | 14 ++ ...Maven__org_jetbrains_dokka_dokka_fatjar_1_0.xml | 14 -- .idea/misc.xml | 1 + .idea/modules.xml | 1 + .idea/vcs.xml | 1 + build.xml | 57 +++---- dokka-fatjar/build.gradle | 53 +++++++ dokka-fatjar/dokka-fatjar.iml | 18 +++ dokka-fatjar/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52271 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + dokka-fatjar/gradlew | 164 +++++++++++++++++++++ dokka-fatjar/gradlew.bat | 90 +++++++++++ dokka-fatjar/settings.gradle | 2 + gradle-plugin/build.gradle | 18 ++- gradle-plugin/dokka-gradle-plugin.iml | 6 +- maven-plugin/dokka-maven-plugin.iml | 5 +- maven-plugin/pom.xml | 49 ++---- 27 files changed, 435 insertions(+), 161 deletions(-) create mode 100644 .idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_1_0.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_gradle_plugin_0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_gradle_plugin_api_0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__org_jetbrains_dokka_dokka_fatjar_1_0.xml create mode 100644 dokka-fatjar/build.gradle create mode 100644 dokka-fatjar/dokka-fatjar.iml create mode 100644 dokka-fatjar/gradle/wrapper/gradle-wrapper.jar create mode 100644 dokka-fatjar/gradle/wrapper/gradle-wrapper.properties create mode 100755 dokka-fatjar/gradlew create mode 100644 dokka-fatjar/gradlew.bat create mode 100644 dokka-fatjar/settings.gradle diff --git a/.idea/gradle.xml b/.idea/gradle.xml index adc07ffd..8efac87e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -2,6 +2,17 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 669ba41d..4b4cbc1b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 83067447..6c261adb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/build.xml b/build.xml index f0690aec..68d2761e 100644 --- a/build.xml +++ b/build.xml @@ -21,37 +21,38 @@ - - - - - - + + + + + + + + - - - - - - - + + - - - - - + + + + + + + + - - - + + + + + + + + @@ -64,9 +65,13 @@ - + + + + + diff --git a/dokka-fatjar/build.gradle b/dokka-fatjar/build.gradle new file mode 100644 index 00000000..e7c9cd97 --- /dev/null +++ b/dokka-fatjar/build.gradle @@ -0,0 +1,53 @@ +group 'org.jetbrains.dokka' +version '0.0.1-SNAPSHOT' + +apply plugin: 'java' +apply plugin: 'maven-publish' + +dependencies { + compile 'org.fusesource.jansi:jansi:[1.11,2.0)' +} + +task wrapper(type: Wrapper) { + gradleVersion = '2.5' + distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" +} + +task sourceJar(type: Jar) { + from fileTree('../src') +} + +jar { + manifest { + attributes "Implementation-Title": "Dokka Kotlin Documentation tool" + attributes "Implementation-Version": version + attributes "Main-Class" : "org.jetbrains.dokka.DokkaPackage" + } + + fileTree(project.file('../lib')).filter { it.name.endsWith('.jar') && !it.name.contains("-sources") }.each { + from (zipTree(it)) { + exclude 'META-INF/MANIFEST.MF' + exclude 'META-INF/*.SF' + exclude 'META-INF/*.DSA' + exclude 'META-INF/*.RSA' + } + } + from (zipTree(project.file('../out/dokka.jar'))) { + exclude 'META-INF/MANIFEST.MF' + exclude 'META-INF/*.SF' + exclude 'META-INF/*.DSA' + exclude 'META-INF/*.RSA' + } +} + +publishing { + publications { + maven(MavenPublication) { + from components.java + + artifact sourceJar { + classifier "sources" + } + } + } +} diff --git a/dokka-fatjar/dokka-fatjar.iml b/dokka-fatjar/dokka-fatjar.iml new file mode 100644 index 00000000..dcf9d922 --- /dev/null +++ b/dokka-fatjar/dokka-fatjar.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dokka-fatjar/gradle/wrapper/gradle-wrapper.jar b/dokka-fatjar/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..30d399d8 Binary files /dev/null and b/dokka-fatjar/gradle/wrapper/gradle-wrapper.jar differ diff --git a/dokka-fatjar/gradle/wrapper/gradle-wrapper.properties b/dokka-fatjar/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..83de133d --- /dev/null +++ b/dokka-fatjar/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Jul 14 17:46:09 MSK 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip diff --git a/dokka-fatjar/gradlew b/dokka-fatjar/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/dokka-fatjar/gradlew @@ -0,0 +1,164 @@ +#!/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/dokka-fatjar/gradlew.bat b/dokka-fatjar/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/dokka-fatjar/gradlew.bat @@ -0,0 +1,90 @@ +@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/dokka-fatjar/settings.gradle b/dokka-fatjar/settings.gradle new file mode 100644 index 00000000..b8f66260 --- /dev/null +++ b/dokka-fatjar/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'dokka-fatjar' + diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index ddc5a460..52fa045e 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -21,9 +21,7 @@ apply plugin: 'maven-publish' sourceCompatibility = 1.6 repositories { - maven { - url "file:///${projectDir}/../out/repo" - } + mavenLocal() mavenCentral() maven { url 'http://oss.sonatype.org/content/repositories/snapshots' @@ -32,11 +30,7 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - compile 'org.jetbrains.dokka:dokka-fatjar:1.0' - - compile 'org.fusesource.jansi:jansi:1.11' + compile "org.jetbrains.dokka:dokka-fatjar:(,0.2)" compile gradleApi() compile localGroovy() @@ -46,6 +40,10 @@ sourceSets { main.java.srcDirs += 'src/main/kotlin' } +task sourceJar(type: Jar) { + from sourceSets.main.allSource +} + task wrapper(type: Wrapper) { gradleVersion = '2.5' distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" @@ -55,6 +53,10 @@ publishing { publications { mavenJava(MavenPublication) { from components.java + + artifact sourceJar { + classifier "sources" + } } } } diff --git a/gradle-plugin/dokka-gradle-plugin.iml b/gradle-plugin/dokka-gradle-plugin.iml index bf48a145..dfbcc3eb 100644 --- a/gradle-plugin/dokka-gradle-plugin.iml +++ b/gradle-plugin/dokka-gradle-plugin.iml @@ -1464,13 +1464,9 @@ - - - - - + \ No newline at end of file diff --git a/maven-plugin/dokka-maven-plugin.iml b/maven-plugin/dokka-maven-plugin.iml index 45a70200..984991e8 100644 --- a/maven-plugin/dokka-maven-plugin.iml +++ b/maven-plugin/dokka-maven-plugin.iml @@ -12,6 +12,7 @@ + @@ -40,7 +41,7 @@ - - + + \ No newline at end of file diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index ad2117a8..71cc856d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -43,28 +43,15 @@ 3.4 - - org.fusesource.jansi - jansi - 1.11 - - org.jetbrains.dokka dokka-fatjar - 1.0 + (,0.2) jar compile - - - my-local-repo - file://${basedir}/../out/repo - - - src/main/kotlin @@ -116,39 +103,25 @@ dokka - - - maven-jar-plugin - 2.6 - - - default-jar - none - - - + maven-source-plugin + 2.4 - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.5 - - - jar-with-dependencies - - false - - make-assembly - package + attach-sources + verify - single + jar-no-fork + + + maven-jar-plugin + 2.6 + -- cgit