Skip to content

Commit

Permalink
fix: version number is now set correctly, was 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sekwah41 committed Dec 15, 2024
1 parent ca75e52 commit 837faa5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
17 changes: 11 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ plugins {
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
}

apply from: 'env-variables.gradle'
apply from: 'changelog-util.gradle'

allprojects {
apply plugin: 'java'
apply plugin: 'idea'
Expand All @@ -48,11 +51,15 @@ allprojects {
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16

}

ext.branch = rootProject.ext.branch
ext.snapshotName = rootProject.ext.snapshotName
ext.githubSha = rootProject.ext.githubSha
ext.shaRef = rootProject.ext.shaRef
ext.isRelease = rootProject.ext.isRelease

apply from: 'env-variables.gradle'
apply from: 'changelog-util.gradle'
def versionString = (rootProject.file('./version.txt').text + (isRelease ? "" : "-${snapshotName}${shaRef}")).replaceAll('\n', '').replaceAll('\r', '')
setVersion(versionString)
}


println("Branch ${ext.branch}${ext.shaRef} isRelease: '${ext.isRelease}'")
Expand All @@ -62,8 +69,6 @@ println("Sha Ref: ${ext.shaRef}")

archivesBaseName = "Advanced-Portals"
group = 'com.sekwah.advancedportals'
def versionString = (file('./version.txt').text + (isRelease ? "" : "-${snapshotName}${shaRef}")).replaceAll('\n', '').replaceAll('\r', '')
setVersion(versionString)
println "Version: ${getVersion()}"

description = ""
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
z# https://docs.gradle.org/current/userguide/build_environment.html
# https://docs.gradle.org/current/userguide/build_environment.html
# Disable with --no-build-cache
org.gradle.caching=true
version=1.0.0

This comment has been minimized.

Copy link
@TreemanKing

TreemanKing Dec 16, 2024

Contributor

Probably can remove the version line? Is it needed for the script?

This comment has been minimized.

Copy link
@sekwah41

sekwah41 Dec 18, 2024

Author Owner

True, i believe i used to update this in the code but yea this isn't needed anymore.

Expand Down

0 comments on commit 837faa5

Please sign in to comment.