Patches

build.gradle

@@ -1,6 +1,6 @@
 group 'org.comroid.util'
 
-tasks.findByName('wrapper').configure {
+tasks.findByName('wrapper')?.configure {
     gradleVersion = '6.2'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
@@ -14,7 +14,7 @@ configurations {
 subprojects {
     group 'org.comroid'
     apply plugin: 'java-library'
-    apply from: "$rootDir/gradle/vars.gradle"
-    apply from: "$rootDir/gradle/javadoc.gradle"
-    apply from: "$rootDir/gradle/global.gradle"
+    apply from: "$parent.projectDir/gradle/vars.gradle"
+    apply from: "$parent.projectDir/gradle/javadoc.gradle"
+    apply from: "$parent.projectDir/gradle/global.gradle"
 }

commandline/build.gradle

@@ -8,7 +8,7 @@ ext {
 }
 
 dependencies {
-    api project(':common-util')
+    api project(':common-util:common-util')
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"

commandline/pom.xml

@@ -9,10 +9,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.comroid</groupId>
   <artifactId>commandline</artifactId>
-  <version>0.10.1-SNAPSHOT</version>
-  <name>common-util</name>
+  <version>0.10.3-SNAPSHOT</version>
+  <name>repo</name>
   <description>Command Line Tools</description>
-  <url>https://github.com/comroid-git/common-util</url>
+  <url>https://github.com/comroid-git/repo</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -28,21 +28,21 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
-    <developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
-    <url>https://github.com/comroid-git/common-util</url>
+    <connection>scm:git:git://github.com/comroid-git/repo.git</connection>
+    <developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
+    <url>https://github.com/comroid-git/repo</url>
   </scm>
   <dependencies>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>interfaces</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <version>0.10.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>common-util</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.5.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -51,11 +51,5 @@
       <version>0.5.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.flogger</groupId>
-      <artifactId>flogger-system-backend</artifactId>
-      <version>0.5.1</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

common-util/build.gradle

@@ -8,8 +8,8 @@ ext {
 }
 
 dependencies {
-    api project(':trie')
-    api project(':mutatio')
+    api project(':common-util:trie')
+    api project(':common-util:mutatio')
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"

common-util/pom.xml

@@ -9,10 +9,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.comroid</groupId>
   <artifactId>common-util</artifactId>
-  <version>1.5.3-SNAPSHOT</version>
-  <name>common-util</name>
+  <version>1.5.5-SNAPSHOT</version>
+  <name>repo</name>
   <description>Extensions to org.comroid:interfaces</description>
-  <url>https://github.com/comroid-git/common-util</url>
+  <url>https://github.com/comroid-git/repo</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -28,27 +28,27 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
-    <developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
-    <url>https://github.com/comroid-git/common-util</url>
+    <connection>scm:git:git://github.com/comroid-git/repo.git</connection>
+    <developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
+    <url>https://github.com/comroid-git/repo</url>
   </scm>
   <dependencies>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>interfaces</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <version>0.10.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>trie</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>mutatio</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <version>0.11.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,11 +57,5 @@
       <version>0.5.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.flogger</groupId>
-      <artifactId>flogger-system-backend</artifactId>
-      <version>0.5.1</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

dreadpool/build.gradle

@@ -8,7 +8,7 @@ ext {
 }
 
 dependencies {
-    api project(":common-util")
+    api project(":common-util:common-util")
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"

dreadpool/pom.xml

@@ -9,10 +9,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.comroid</groupId>
   <artifactId>dreadpool</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
-  <name>common-util</name>
+  <version>0.10.1-SNAPSHOT</version>
+  <name>repo</name>
   <description>ThreadPools with interruptible tasks</description>
-  <url>https://github.com/comroid-git/common-util</url>
+  <url>https://github.com/comroid-git/repo</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -28,21 +28,21 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
-    <developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
-    <url>https://github.com/comroid-git/common-util</url>
+    <connection>scm:git:git://github.com/comroid-git/repo.git</connection>
+    <developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
+    <url>https://github.com/comroid-git/repo</url>
   </scm>
   <dependencies>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>interfaces</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <version>0.10.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>common-util</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.5.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -51,11 +51,5 @@
       <version>0.5.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.flogger</groupId>
-      <artifactId>flogger-system-backend</artifactId>
-      <version>0.5.1</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

gradle/global.gradle

@@ -13,10 +13,10 @@ tasks.withType(Javadoc) {
 }
 
 sourceSets {
-    main.java.srcDirs = files("$rootDir/src/$artifactName/main/java")
-    main.resources.srcDirs = files("$rootDir/src/$artifactName/main/resources")
-    test.java.srcDirs = files("$rootDir/src/$artifactName/test/java")
-    test.resources.srcDirs = files("$rootDir/src/$artifactName/test/resources")
+    main.java.srcDirs = files("$parent.projectDir/src/$artifactName/main/java")
+    main.resources.srcDirs = files("$parent.projectDir/src/$artifactName/main/resources")
+    test.java.srcDirs = files("$parent.projectDir/src/$artifactName/test/java")
+    test.resources.srcDirs = files("$parent.projectDir/src/$artifactName/test/resources")
 }
 
 task sourcesJar(type: Jar) {
@@ -60,8 +60,13 @@ repositories {
 }
 
 dependencies {
-    if (project.name != 'interfaces')
-        api project(':interfaces')
+    if (project.name != 'interfaces') {
+        if (System.getenv().containsKey("TEAMCITY")) {
+            api project(':interfaces')
+        } else {
+            api project(':common-util:interfaces')
+        }
+    }
 
     implementation 'com.google.flogger:flogger:0.5.1'
 
@@ -70,4 +75,5 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.easymock:easymock:4.1'
     testImplementation 'org.codehaus.groovy:groovy:3.0.0-rc-2'
+    testImplementation 'com.google.flogger:flogger-system-backend:0.5.1'
 }

gradle/vars.gradle

@@ -33,7 +33,7 @@ if (canPublishToSonatype) {
 
 if (canPublishToGitHub) {
     ext {
-        githubRegistryUrl = uri("https://maven.pkg.github.com/${userbase.toLowerCase()}/${rootProject.name.toLowerCase()}")
+        githubRegistryUrl = uri("https://maven.pkg.github.com/${userbase.toLowerCase()}/${parent.name.toLowerCase()}")
         githubUsername = getenv('GITHUB_USERNAME')
         githubPassword = getenv('GITHUB_PASSWORD')
     }

interfaces/build.gradle

@@ -7,4 +7,4 @@ ext {
     projectDescription = "comroid Interfaces"
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"

interfaces/pom.xml

@@ -9,10 +9,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.comroid</groupId>
   <artifactId>interfaces</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
-  <name>common-util</name>
+  <version>0.10.2-SNAPSHOT</version>
+  <name>repo</name>
   <description>comroid Interfaces</description>
-  <url>https://github.com/comroid-git/common-util</url>
+  <url>https://github.com/comroid-git/repo</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -28,9 +28,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
-    <developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
-    <url>https://github.com/comroid-git/common-util</url>
+    <connection>scm:git:git://github.com/comroid-git/repo.git</connection>
+    <developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
+    <url>https://github.com/comroid-git/repo</url>
   </scm>
   <dependencies>
     <dependency>
@@ -39,11 +39,5 @@
       <version>0.5.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.flogger</groupId>
-      <artifactId>flogger-system-backend</artifactId>
-      <version>0.5.1</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

listnr/build.gradle

@@ -8,8 +8,8 @@ ext {
 }
 
 dependencies {
-    api project(":common-util")
-    api project(":spellbind")
+    api project(":common-util:common-util")
+    api project(":common-util:spellbind")
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"

listnr/pom.xml

@@ -9,10 +9,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.comroid</groupId>
   <artifactId>listnr</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>common-util</name>
+  <version>0.10.0-SNAPSHOT</version>
+  <name>repo</name>
   <description>Event Handling solution</description>
-  <url>https://github.com/comroid-git/common-util</url>
+  <url>https://github.com/comroid-git/repo</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -28,27 +28,27 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
-    <developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
-    <url>https://github.com/comroid-git/common-util</url>
+    <connection>scm:git:git://github.com/comroid-git/repo.git</connection>
+    <developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
+    <url>https://github.com/comroid-git/repo</url>
   </scm>
   <dependencies>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>interfaces</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <version>0.10.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>common-util</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.5.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.comroid</groupId>
       <artifactId>spellbind</artifactId>
-      <version>0.20.0-SNAPSHOT</version>
+      <version>0.22.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,11 +57,5 @@
       <version>0.5.1</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.flogger</groupId>
-      <artifactId>flogger-system-backend</artifactId>
-      <version>0.5.1</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

matrix/build.gradle

@@ -8,8 +8,8 @@ ext {
 }
 
 dependencies {
-    api project(":common-util")
-    api project(":spellbind")
+    api project(":common-util:common-util")
+    api project(":common-util:spellbind")
 }
 
-apply from: "$rootDir/gradle/publishing.gradle"
+apply from: "$parent.projectDir/gradle/publishing.gradle"