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

Commit ee3fc05

Browse files
burdotoburdoto
committed
gradle 3
1 parent a62aafb commit ee3fc05

13 files changed

Lines changed: 106 additions & 36 deletions

File tree

‎commandline/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ ext {
88
}
99

1010
dependencies {
11-
api project(':common-util:common-util')
11+
if (isAutoDeploy) {
12+
api project(":common-util")
13+
} else {
14+
api project(":common-util:common-util")
15+
}
1216
}
1317

1418
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎common-util/build.gradle‎

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

1010
dependencies {
11-
api project(':common-util:trie')
12-
api project(':common-util:mutatio')
11+
if (isAutoDeploy) {
12+
api project(":trie")
13+
api project(":mutatio")
14+
} else {
15+
api project(":common-util:trie")
16+
api project(":common-util:mutatio")
17+
}
1318
}
1419

1520
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎dreadpool/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ ext {
88
}
99

1010
dependencies {
11-
api project(":common-util:common-util")
11+
if (isAutoDeploy) {
12+
api project(":common-util")
13+
} else {
14+
api project(":common-util:common-util")
15+
}
1216
}
1317

1418
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎gradle/global.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ repositories {
6161

6262
dependencies {
6363
if (project.name != 'interfaces') {
64-
if (System.getenv().containsKey("TEAMCITY")) {
64+
if (isAutoDeploy) {
6565
api project(':interfaces')
6666
} else {
6767
api project(':common-util:interfaces')

‎gradle/vars.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import static java.lang.System.getenv
22

33
ext {
4+
isAutoDeploy = getenv().containsKey("TEAMCITY") || getenv().containsKey("JITPACK");
5+
46
artifactName = project.name.equals('util') ? 'common-util' : project.name
57
projectDescription = ''
68
userbase = 'comroid-git'

‎listnr/build.gradle‎

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

1010
dependencies {
11-
api project(":common-util:common-util")
12-
api project(":common-util:spellbind")
11+
if (isAutoDeploy) {
12+
api project(":common-util")
13+
api project(":spellbind")
14+
} else {
15+
api project(":common-util:common-util")
16+
api project(":common-util:spellbind")
17+
}
1318
}
1419

1520
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎matrix/build.gradle‎

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

1010
dependencies {
11-
api project(":common-util:common-util")
12-
api project(":common-util:spellbind")
11+
if (isAutoDeploy) {
12+
api project(":common-util")
13+
api project(":spellbind")
14+
} else {
15+
api project(":common-util:common-util")
16+
api project(":common-util:spellbind")
17+
}
1318
}
1419

1520
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎restless/build.gradle‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,45 @@ dependencies {
4444
java8compatCompileOnly 'org.jetbrains:annotations:19.0.0'
4545
java11compatCompileOnly 'org.jetbrains:annotations:19.0.0'
4646

47-
api project(':common-util:common-util')
48-
java8compatCompileOnly project(':common-util:restless')
49-
java11compatCompileOnly project(':common-util:restless')
50-
51-
api project(':common-util:uniform')
52-
java8compatImplementation project(':common-util:uniform')
53-
java11compatImplementation project(':common-util:uniform')
54-
api project(':common-util:varbind')
55-
java8compatImplementation project(':common-util:varbind')
56-
java11compatImplementation project(':common-util:varbind')
57-
58-
// websocket dependencies
59-
api project(':common-util:listnr')
60-
java8compatImplementation project(':common-util:listnr')
61-
java11compatImplementation project(':common-util:listnr')
62-
api project(':common-util:dreadpool')
63-
java8compatImplementation project(':common-util:dreadpool')
64-
java11compatImplementation project(':common-util:dreadpool')
47+
if (isAutoDeploy) {
48+
api project(':common-util')
49+
java8compatCompileOnly project(':restless')
50+
java11compatCompileOnly project(':restless')
51+
52+
api project(':uniform')
53+
java8compatImplementation project(':uniform')
54+
java11compatImplementation project(':uniform')
55+
api project(':varbind')
56+
java8compatImplementation project(':varbind')
57+
java11compatImplementation project(':varbind')
58+
59+
// websocket dependencies
60+
api project(':listnr')
61+
java8compatImplementation project(':listnr')
62+
java11compatImplementation project(':listnr')
63+
api project(':dreadpool')
64+
java8compatImplementation project(':dreadpool')
65+
java11compatImplementation project(':dreadpool')
66+
} else {
67+
api project(':common-util:common-util')
68+
java8compatCompileOnly project(':common-util:restless')
69+
java11compatCompileOnly project(':common-util:restless')
70+
71+
api project(':common-util:uniform')
72+
java8compatImplementation project(':common-util:uniform')
73+
java11compatImplementation project(':common-util:uniform')
74+
api project(':common-util:varbind')
75+
java8compatImplementation project(':common-util:varbind')
76+
java11compatImplementation project(':common-util:varbind')
77+
78+
// websocket dependencies
79+
api project(':common-util:listnr')
80+
java8compatImplementation project(':common-util:listnr')
81+
java11compatImplementation project(':common-util:listnr')
82+
api project(':common-util:dreadpool')
83+
java8compatImplementation project(':common-util:dreadpool')
84+
java11compatImplementation project(':common-util:dreadpool')
85+
}
6586

6687
// http adapter dependencies
6788
java8compatCompileOnly 'com.squareup.okhttp3:okhttp:4.7.2'

‎spellbind/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ ext {
88
}
99

1010
dependencies {
11-
api project(":common-util:common-util")
11+
if (isAutoDeploy) {
12+
api project(":common-util")
13+
} else {
14+
api project(":common-util:common-util")
15+
}
1216
}
1317

1418
apply from: "$parent.projectDir/gradle/publishing.gradle"

‎trie/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ ext {
88
}
99

1010
dependencies {
11-
api project(':common-util:mutatio')
11+
if (isAutoDeploy) {
12+
api project(":mutatio")
13+
} else {
14+
api project(":common-util:mutatio")
15+
}
1216
}
1317

1418
apply from: "$parent.projectDir/gradle/publishing.gradle"

0 commit comments

Comments
 (0)