diff options
author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2023-11-10 11:46:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-10 11:46:54 +0100 |
commit | 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 (patch) | |
tree | 1b915207b2b9f61951ddbf0ff2e687efd053d555 /integration-tests/gradle/projects/it-multimodule-1 | |
parent | a44efd4ba0c2e4ab921ff75e0f53fc9335aa79db (diff) | |
download | dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.tar.gz dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.tar.bz2 dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.zip |
Restructure the project to utilize included builds (#3174)
* Refactor and simplify artifact publishing
* Update Gradle to 8.4
* Refactor and simplify convention plugins and build scripts
Fixes #3132
---------
Co-authored-by: Adam <897017+aSemy@users.noreply.github.com>
Co-authored-by: Oleg Yukhnevich <whyoleg@gmail.com>
Diffstat (limited to 'integration-tests/gradle/projects/it-multimodule-1')
16 files changed, 0 insertions, 410 deletions
diff --git a/integration-tests/gradle/projects/it-multimodule-1/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/build.gradle deleted file mode 100644 index 57d22b79..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' - id("org.jetbrains.dokka") -} - -apply from: '../template.root.gradle.kts' - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib" - implementation project(':first') - implementation project(':second') -} - - -subprojects { - apply plugin: 'org.jetbrains.kotlin.jvm' - apply plugin: 'org.jetbrains.dokka' -} diff --git a/integration-tests/gradle/projects/it-multimodule-1/first/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/first/build.gradle deleted file mode 100644 index e69de29b..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/first/build.gradle +++ /dev/null diff --git a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstClass.kt b/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstClass.kt deleted file mode 100644 index 93f73bf4..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstClass.kt +++ /dev/null @@ -1,11 +0,0 @@ -package foo - -/** - * First class description - */ -open class FirstClass{ - /** - * PropertyOne description - */ - val propertyOne: Int = 5 -}
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstSubclass.kt b/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstSubclass.kt deleted file mode 100644 index 0deb65c0..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstSubclass.kt +++ /dev/null @@ -1,12 +0,0 @@ -package foo - -/** - * Subclass description - * @property surname Surname description - */ -class FirstSubclass(var surname: String) : FirstClass() { - /** - * printNewLine description - */ - fun printNewline() = print("\r\n") -}
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/Main.kt b/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/Main.kt deleted file mode 100644 index 8c7f58a7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/Main.kt +++ /dev/null @@ -1,8 +0,0 @@ -package foo - -/** - * Main function - */ -fun main(args : Array<String>) { - println("Hello, world!") -}
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/noPackage.kt b/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/noPackage.kt deleted file mode 100644 index c41e218f..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/noPackage.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun noPackage(): String = "Hello there" - -open class NoPackage diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties deleted file mode 100644 index 5904fc21..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index 62d4c053..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a434026d..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradlew b/integration-tests/gradle/projects/it-multimodule-1/gradlew deleted file mode 100755 index fbd7c515..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## 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='"-Xmx64m" "-Xms64m"' - -# 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 or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" - -exec "$JAVACMD" "$@" diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradlew.bat b/integration-tests/gradle/projects/it-multimodule-1/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@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 Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@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="-Xmx64m" "-Xms64m"
-
-@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/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle deleted file mode 100644 index 2b62f963..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - implementation project(":first") -} -dokkaHtml { - dependsOn(":first:dokkaHtml") - dokkaSourceSets { - "main" { - externalDocumentationLink { - url.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/"))) - packageListUrl.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/first/package-list"))) - } - } - } -} diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt deleted file mode 100644 index d2f30ef7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt +++ /dev/null @@ -1 +0,0 @@ -class NoPackageClass : NoPackage() diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt deleted file mode 100644 index 6a0c935e..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt +++ /dev/null @@ -1,21 +0,0 @@ -package bar -/** - * Second class in second module description [foo.FirstClass] - * @author John Doe - * @version 0.1.3 - * @param name Name description text text text. -*/ -class SecondClass(val name: String) { - val firstProperty = "propertystring" - /** - * Second property in second module description [foo.FirstSubclass] - */ - var secondProperty: String = "" - set(value) { - println("Second property not set") - } - - init { - println("InitializerBlock") - } -} diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt deleted file mode 100644 index cc24a6b7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt +++ /dev/null @@ -1,11 +0,0 @@ -package foo - -/** - * Third class description - */ -open class ThirdClass{ - /** - * PropertyOne description - */ - val propertyOne: Int = 5 -}
\ No newline at end of file diff --git a/integration-tests/gradle/projects/it-multimodule-1/settings.gradle.kts b/integration-tests/gradle/projects/it-multimodule-1/settings.gradle.kts deleted file mode 100644 index ced319f2..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/settings.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -apply(from = "../template.settings.gradle.kts") -rootProject.name = "it-multimodule-1" -include(":first") -include(":second") |