Skip to content

Auto PR: Merge dev into master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrakDv merged 2 commits into from
Dec 22, 2024
Merged

Auto PR: Merge dev into master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888e870
fix - jitpack hash.
DrakDv Dec 22, 2024
557d04b
fix - gradle issues.
DrakDv Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ plugins {
id 'maven-publish' // for jitpack.io
}

String group = System.getenv("GROUP") ?: properties["group"]
String group = System.getenv("GROUP") ?: properties["group"] ?: "com.github.server-utilities"
String commitHash = "";

rootProject.group = group
rootProject.version = properties["version"] + "." + commitHash
if (System.getenv("JITPACK") != "true") {
rootProject.group = group
rootProject.version = properties["version"] + "." + commitHash
}

repositories {
mavenCentral()
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.gradle.caching = true
org.gradle.vfs.watch = false

# Other properties
name = TheBase
group = com.github.server-utilities
version = 1.0
#name = TheBase
#group = com.github.server-utilities
#version = 1.0
6 changes: 4 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
String artifact = System.getenv('ARTIFACT') ?: properties['name']
String artifact = System.getenv('ARTIFACT') ?: properties['name'] ?: rootProject.name

rootProject.name = artifact
if (System.getenv("JITPACK") != "true") {
rootProject.name = artifact
}
Loading