Skip to content

Commit 22cf245

Browse files
committed
Stop using conventions for java/version
1 parent 4de8ce7 commit 22cf245

File tree

5 files changed

+108
-44
lines changed

5 files changed

+108
-44
lines changed

buildSrc/src/main/kotlin/gander-convention.gradle.kts

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import dev.compactmachines.GanderConstants
22
import org.slf4j.event.Level
33

4-
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
5-
if (envVersion.startsWith("v"))
6-
envVersion = envVersion.trimStart('v')
7-
84
plugins {
95
id("java-library")
106
id("idea")
@@ -17,13 +13,7 @@ plugins {
1713
// pulling in version data from GanderConstants since version catalogs
1814
// from the main outer project are not accessible here
1915

20-
base {
21-
archivesName = project.name
22-
group = "dev.compactmods.gander"
23-
version = envVersion
24-
25-
libsDirectory.convention(rootProject.layout.projectDirectory.dir("libs/${project.name}"))
26-
}
16+
base.libsDirectory.convention(rootProject.layout.projectDirectory.dir("libs/${project.name}"))
2717

2818
idea.module {
2919
if(!GanderConstants.IS_CI) {
@@ -93,21 +83,3 @@ javaToolchains.compilerFor {
9383
languageVersion.convention(GanderConstants.JAVA_VERSION)
9484
vendor.convention(GanderConstants.JAVA_VENDOR)
9585
}
96-
97-
val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
98-
publishing {
99-
publications.register<MavenPublication>(project.name) {
100-
from(components.getByName("java"))
101-
}
102-
103-
repositories {
104-
// GitHub Packages
105-
maven(PACKAGES_URL) {
106-
name = "GitHubPackages"
107-
credentials {
108-
username = System.getenv("GITHUB_ACTOR")
109-
password = System.getenv("GITHUB_TOKEN")
110-
}
111-
}
112-
}
113-
}

core/build.gradle.kts

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
1-
val isRelease: Boolean = (System.getenv("RELEASE") ?: "false").equals("true", true)
1+
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
2+
if (envVersion.startsWith("v"))
3+
envVersion = envVersion.trimStart('v')
24

35
plugins {
46
id("gander-convention")
57
}
8+
9+
base {
10+
archivesName = project.name
11+
group = "dev.compactmods.gander"
12+
version = envVersion
13+
}
14+
15+
val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
16+
publishing {
17+
publications.register<MavenPublication>(project.name) {
18+
from(components.getByName("java"))
19+
}
20+
21+
repositories {
22+
// GitHub Packages
23+
maven(PACKAGES_URL) {
24+
name = "GitHubPackages"
25+
credentials {
26+
username = System.getenv("GITHUB_ACTOR")
27+
password = System.getenv("GITHUB_TOKEN")
28+
}
29+
}
30+
}
31+
}

levels/build.gradle.kts

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
1+
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
2+
if (envVersion.startsWith("v"))
3+
envVersion = envVersion.trimStart('v')
4+
15
plugins {
26
id("gander-convention")
37
}
48

5-
// simply exists to apply the module convention script
6-
// sets up MDG workspace and includes manifest data from resources dir
7-
// additional setup specific to this module may be applied here
9+
base {
10+
archivesName = project.name
11+
group = "dev.compactmods.gander"
12+
version = envVersion
13+
}
14+
15+
val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
16+
publishing {
17+
publications.register<MavenPublication>(project.name) {
18+
from(components.getByName("java"))
19+
}
820

9-
//mixin {
10-
// add(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], "gander_levels.mixins.json")
11-
// config("gander_levels.mixins.json")
12-
//}
21+
repositories {
22+
// GitHub Packages
23+
maven(PACKAGES_URL) {
24+
name = "GitHubPackages"
25+
credentials {
26+
username = System.getenv("GITHUB_ACTOR")
27+
password = System.getenv("GITHUB_TOKEN")
28+
}
29+
}
30+
}
31+
}

rendering/build.gradle.kts

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
1+
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
2+
if (envVersion.startsWith("v"))
3+
envVersion = envVersion.trimStart('v')
4+
15
plugins {
26
id("gander-convention")
37
}
48

5-
// simply exists to apply the module convention script
6-
// sets up MDG workspace and includes manifest data from resources dir
7-
// additional setup specific to this module may be applied here
9+
base {
10+
archivesName = project.name
11+
group = "dev.compactmods.gander"
12+
version = envVersion
13+
}
14+
15+
val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
16+
publishing {
17+
publications.register<MavenPublication>(project.name) {
18+
from(components.getByName("java"))
19+
}
820

9-
//mixin {
10-
// add(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], "gander_render.mixins.json")
11-
// config("gander_render.mixins.json")
12-
//}
21+
repositories {
22+
// GitHub Packages
23+
maven(PACKAGES_URL) {
24+
name = "GitHubPackages"
25+
credentials {
26+
username = System.getenv("GITHUB_ACTOR")
27+
password = System.getenv("GITHUB_TOKEN")
28+
}
29+
}
30+
}
31+
}

ui/build.gradle.kts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,36 @@
1+
var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
2+
if (envVersion.startsWith("v"))
3+
envVersion = envVersion.trimStart('v')
4+
15
plugins {
26
id("gander-convention")
37
}
48

9+
base {
10+
archivesName = project.name
11+
group = "dev.compactmods.gander"
12+
version = envVersion
13+
}
14+
515
dependencies {
616
implementation(project(":core"))
717
implementation(project(":rendering"))
818
}
19+
20+
val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
21+
publishing {
22+
publications.register<MavenPublication>(project.name) {
23+
from(components.getByName("java"))
24+
}
25+
26+
repositories {
27+
// GitHub Packages
28+
maven(PACKAGES_URL) {
29+
name = "GitHubPackages"
30+
credentials {
31+
username = System.getenv("GITHUB_ACTOR")
32+
password = System.getenv("GITHUB_TOKEN")
33+
}
34+
}
35+
}
36+
}

0 commit comments

Comments
 (0)