Skip to content
This repository was archived by the owner on May 6, 2021. It is now read-only.

Commit a62aafb

Browse files
burdotoburdoto
authored
Merge pull request #55 from comroid-git/dev
Patches
2 parents d149128 + 7669fda commit a62aafb

158 files changed

Lines changed: 4348 additions & 3104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
group 'org.comroid.util'
22

3-
tasks.findByName('wrapper').configure {
3+
tasks.findByName('wrapper')?.configure {
44
gradleVersion = '6.2'
55
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
66
}
@@ -14,7 +14,7 @@ configurations {
1414
subprojects {
1515
group 'org.comroid'
1616
apply plugin: 'java-library'
17-
apply from: "$rootDir/gradle/vars.gradle"
18-
apply from: "$rootDir/gradle/javadoc.gradle"
19-
apply from: "$rootDir/gradle/global.gradle"
17+
apply from: "$parent.projectDir/gradle/vars.gradle"
18+
apply from: "$parent.projectDir/gradle/javadoc.gradle"
19+
apply from: "$parent.projectDir/gradle/global.gradle"
2020
}

‎commandline/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext {
88
}
99

1010
dependencies {
11-
api project(':common-util')
11+
api project(':common-util:common-util')
1212
}
1313

14-
apply from: "$rootDir/gradle/publishing.gradle"
14+
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎commandline/pom.xml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>org.comroid</groupId>
1111
<artifactId>commandline</artifactId>
12-
<version>0.10.1-SNAPSHOT</version>
13-
<name>common-util</name>
12+
<version>0.10.3-SNAPSHOT</version>
13+
<name>repo</name>
1414
<description>Command Line Tools</description>
15-
<url>https://github.com/comroid-git/common-util</url>
15+
<url>https://github.com/comroid-git/repo</url>
1616
<inceptionYear>2020</inceptionYear>
1717
<licenses>
1818
<license>
@@ -28,21 +28,21 @@
2828
</developer>
2929
</developers>
3030
<scm>
31-
<connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
32-
<developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
33-
<url>https://github.com/comroid-git/common-util</url>
31+
<connection>scm:git:git://github.com/comroid-git/repo.git</connection>
32+
<developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
33+
<url>https://github.com/comroid-git/repo</url>
3434
</scm>
3535
<dependencies>
3636
<dependency>
3737
<groupId>org.comroid</groupId>
3838
<artifactId>interfaces</artifactId>
39-
<version>0.10.0-SNAPSHOT</version>
39+
<version>0.10.2-SNAPSHOT</version>
4040
<scope>compile</scope>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.comroid</groupId>
4444
<artifactId>common-util</artifactId>
45-
<version>1.5.3-SNAPSHOT</version>
45+
<version>1.5.5-SNAPSHOT</version>
4646
<scope>compile</scope>
4747
</dependency>
4848
<dependency>
@@ -51,11 +51,5 @@
5151
<version>0.5.1</version>
5252
<scope>runtime</scope>
5353
</dependency>
54-
<dependency>
55-
<groupId>com.google.flogger</groupId>
56-
<artifactId>flogger-system-backend</artifactId>
57-
<version>0.5.1</version>
58-
<scope>runtime</scope>
59-
</dependency>
6054
</dependencies>
6155
</project>

‎common-util/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ext {
88
}
99

1010
dependencies {
11-
api project(':trie')
12-
api project(':mutatio')
11+
api project(':common-util:trie')
12+
api project(':common-util:mutatio')
1313
}
1414

15-
apply from: "$rootDir/gradle/publishing.gradle"
15+
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎common-util/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>org.comroid</groupId>
1111
<artifactId>common-util</artifactId>
12-
<version>1.5.3-SNAPSHOT</version>
13-
<name>common-util</name>
12+
<version>1.5.5-SNAPSHOT</version>
13+
<name>repo</name>
1414
<description>Extensions to org.comroid:interfaces</description>
15-
<url>https://github.com/comroid-git/common-util</url>
15+
<url>https://github.com/comroid-git/repo</url>
1616
<inceptionYear>2020</inceptionYear>
1717
<licenses>
1818
<license>
@@ -28,27 +28,27 @@
2828
</developer>
2929
</developers>
3030
<scm>
31-
<connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
32-
<developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
33-
<url>https://github.com/comroid-git/common-util</url>
31+
<connection>scm:git:git://github.com/comroid-git/repo.git</connection>
32+
<developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
33+
<url>https://github.com/comroid-git/repo</url>
3434
</scm>
3535
<dependencies>
3636
<dependency>
3737
<groupId>org.comroid</groupId>
3838
<artifactId>interfaces</artifactId>
39-
<version>0.10.0-SNAPSHOT</version>
39+
<version>0.10.2-SNAPSHOT</version>
4040
<scope>compile</scope>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.comroid</groupId>
4444
<artifactId>trie</artifactId>
45-
<version>1.0.0-SNAPSHOT</version>
45+
<version>1.0.1-SNAPSHOT</version>
4646
<scope>compile</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.comroid</groupId>
5050
<artifactId>mutatio</artifactId>
51-
<version>0.10.0-SNAPSHOT</version>
51+
<version>0.11.0-SNAPSHOT</version>
5252
<scope>compile</scope>
5353
</dependency>
5454
<dependency>
@@ -57,11 +57,5 @@
5757
<version>0.5.1</version>
5858
<scope>runtime</scope>
5959
</dependency>
60-
<dependency>
61-
<groupId>com.google.flogger</groupId>
62-
<artifactId>flogger-system-backend</artifactId>
63-
<version>0.5.1</version>
64-
<scope>runtime</scope>
65-
</dependency>
6660
</dependencies>
6761
</project>

‎dreadpool/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext {
88
}
99

1010
dependencies {
11-
api project(":common-util")
11+
api project(":common-util:common-util")
1212
}
1313

14-
apply from: "$rootDir/gradle/publishing.gradle"
14+
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎dreadpool/pom.xml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>org.comroid</groupId>
1111
<artifactId>dreadpool</artifactId>
12-
<version>0.10.0-SNAPSHOT</version>
13-
<name>common-util</name>
12+
<version>0.10.1-SNAPSHOT</version>
13+
<name>repo</name>
1414
<description>ThreadPools with interruptible tasks</description>
15-
<url>https://github.com/comroid-git/common-util</url>
15+
<url>https://github.com/comroid-git/repo</url>
1616
<inceptionYear>2020</inceptionYear>
1717
<licenses>
1818
<license>
@@ -28,21 +28,21 @@
2828
</developer>
2929
</developers>
3030
<scm>
31-
<connection>scm:git:git://github.com/comroid-git/common-util.git</connection>
32-
<developerConnection>scm:git:ssh://github.com/comroid-git/common-util.git</developerConnection>
33-
<url>https://github.com/comroid-git/common-util</url>
31+
<connection>scm:git:git://github.com/comroid-git/repo.git</connection>
32+
<developerConnection>scm:git:ssh://github.com/comroid-git/repo.git</developerConnection>
33+
<url>https://github.com/comroid-git/repo</url>
3434
</scm>
3535
<dependencies>
3636
<dependency>
3737
<groupId>org.comroid</groupId>
3838
<artifactId>interfaces</artifactId>
39-
<version>0.10.0-SNAPSHOT</version>
39+
<version>0.10.2-SNAPSHOT</version>
4040
<scope>compile</scope>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.comroid</groupId>
4444
<artifactId>common-util</artifactId>
45-
<version>1.5.3-SNAPSHOT</version>
45+
<version>1.5.5-SNAPSHOT</version>
4646
<scope>compile</scope>
4747
</dependency>
4848
<dependency>
@@ -51,11 +51,5 @@
5151
<version>0.5.1</version>
5252
<scope>runtime</scope>
5353
</dependency>
54-
<dependency>
55-
<groupId>com.google.flogger</groupId>
56-
<artifactId>flogger-system-backend</artifactId>
57-
<version>0.5.1</version>
58-
<scope>runtime</scope>
59-
</dependency>
6054
</dependencies>
6155
</project>

‎gradle/global.gradle‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ tasks.withType(Javadoc) {
1313
}
1414

1515
sourceSets {
16-
main.java.srcDirs = files("$rootDir/src/$artifactName/main/java")
17-
main.resources.srcDirs = files("$rootDir/src/$artifactName/main/resources")
18-
test.java.srcDirs = files("$rootDir/src/$artifactName/test/java")
19-
test.resources.srcDirs = files("$rootDir/src/$artifactName/test/resources")
16+
main.java.srcDirs = files("$parent.projectDir/src/$artifactName/main/java")
17+
main.resources.srcDirs = files("$parent.projectDir/src/$artifactName/main/resources")
18+
test.java.srcDirs = files("$parent.projectDir/src/$artifactName/test/java")
19+
test.resources.srcDirs = files("$parent.projectDir/src/$artifactName/test/resources")
2020
}
2121

2222
task sourcesJar(type: Jar) {
@@ -60,8 +60,13 @@ repositories {
6060
}
6161

6262
dependencies {
63-
if (project.name != 'interfaces')
64-
api project(':interfaces')
63+
if (project.name != 'interfaces') {
64+
if (System.getenv().containsKey("TEAMCITY")) {
65+
api project(':interfaces')
66+
} else {
67+
api project(':common-util:interfaces')
68+
}
69+
}
6570

6671
implementation 'com.google.flogger:flogger:0.5.1'
6772

@@ -70,4 +75,5 @@ dependencies {
7075
testImplementation 'junit:junit:4.13'
7176
testImplementation 'org.easymock:easymock:4.1'
7277
testImplementation 'org.codehaus.groovy:groovy:3.0.0-rc-2'
78+
testImplementation 'com.google.flogger:flogger-system-backend:0.5.1'
7379
}

‎gradle/vars.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (canPublishToSonatype) {
3333

3434
if (canPublishToGitHub) {
3535
ext {
36-
githubRegistryUrl = uri("https://maven.pkg.github.com/${userbase.toLowerCase()}/${rootProject.name.toLowerCase()}")
36+
githubRegistryUrl = uri("https://maven.pkg.github.com/${userbase.toLowerCase()}/${parent.name.toLowerCase()}")
3737
githubUsername = getenv('GITHUB_USERNAME')
3838
githubPassword = getenv('GITHUB_PASSWORD')
3939
}

‎interfaces/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ext {
77
projectDescription = "comroid Interfaces"
88
}
99

10-
apply from: "$rootDir/gradle/publishing.gradle"
10+
apply from: "$parent.projectDir/gradle/publishing.gradle"

0 commit comments

Comments
 (0)