diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0d99751..8788ef7 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -16,7 +16,6 @@ <bytecodeTargetLevel> <module name="common" target="1.8" /> <module name="core8" target="1.8" /> - <module name="documents" target="1.5" /> <module name="documents (2)" target="1.5" /> <module name="java" target="17" /> <module name="jvm" target="11" /> diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index a3d569e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/src/core/core.iml" filepath="$PROJECT_DIR$/src/core/core.iml" /> - <module fileurl="file://$PROJECT_DIR$/src/groovy/groovy.iml" filepath="$PROJECT_DIR$/src/groovy/groovy.iml" /> - <module fileurl="file://$PROJECT_DIR$/src/scala/scala.iml" filepath="$PROJECT_DIR$/src/scala/scala.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/.idea/solutions.bitbadger.documents.iml b/.idea/solutions.bitbadger.documents.iml deleted file mode 100644 index cd2501b..0000000 --- a/.idea/solutions.bitbadger.documents.iml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/documents.iml b/documents.iml deleted file mode 100644 index 115f078..0000000 --- a/documents.iml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4"> - <component name="AdditionalModuleElements"> - <content url="file://$MODULE_DIR$" dumb="true"> - <sourceFolder url="file://$MODULE_DIR$/src/common/src/main/kotlin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/common/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/common/src/test/kotlin" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/main/kotlin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/test/kotlin" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/kotlin/src/main/kotlin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/kotlin/src/test/kotlin" isTestSource="true" /> - </content> - </component> -</module> \ No newline at end of file diff --git a/java.iml b/java.iml deleted file mode 100644 index 0ae9cfd..0000000 --- a/java.iml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4"> - <component name="AdditionalModuleElements"> - <content url="file://$MODULE_DIR$/src/java" dumb="true"> - <sourceFolder url="file://$MODULE_DIR$/src/java/src/main/java" isTestSource="false" /> - </content> - </component> -</module> \ No newline at end of file diff --git a/src/scala/pom.xml b/src/scala/pom.xml index 6a8aa83..2ffcc5d 100644 --- a/src/scala/pom.xml +++ b/src/scala/pom.xml @@ -21,6 +21,19 @@ <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory> <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${sourcePlugin.version}</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> @@ -32,13 +45,27 @@ <goal>testCompile</goal> </goals> </execution> - <!-- <execution> - <phase>package</phase> + <execution> <id>attach-javadocs</id> <goals> <goal>doc-jar</goal> </goals> - </execution> --> + <configuration> + <args>-nobootcp</args> + <scaladocClassName>dotty.tools.scaladoc.Main</scaladocClassName> + <sourceDir>${project.build.outputDirectory}</sourceDir> + <includes> + <include>**/*.tasty</include> + </includes> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scaladoc_3</artifactId> + <version>${scala.version}</version> + </dependency> + </dependencies> + </configuration> + </execution> </executions> <configuration> <source>${java.version}</source> @@ -70,7 +97,7 @@ <target>${java.version}</target> </configuration> </plugin> - <plugin> + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>${sourcePlugin.version}</version> @@ -82,7 +109,7 @@ </goals> </execution> </executions> - </plugin> + </plugin> --> </plugins> </build>