Skip to content

Improving versioning schema #43

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
Matts merged 1 commit into from
Nov 1, 2018
Merged

Improving versioning schema #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ buildscript {

plugins {
id 'de.fuerstenau.buildconfig' version '1.1.8'
id 'idea'
id 'net.minecraftforge.gradle.forge' version '2.0.2'
}

apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'idea'

ext.configFile = file "build.properties"

configFile.withReader {
Expand All @@ -23,12 +22,17 @@ configFile.withReader {
project.ext.config = new ConfigSlurper().parse prop
}

version = config.mod_version
version = config.mc_version + '-' + config.mod_version
group = config.mod_group
archivesBaseName = config.mod_name

if (System.getenv().BUILD_NUMBER)
version = "${config.mod_version}.b${System.getenv().BUILD_NUMBER}"
version = "${version}.${System.getenv().BUILD_NUMBER}"

if (!project.hasProperty('signingKeystore')) {
project.properties.put('signingFingerprint', 'unsigned')
version = version + '-unsigned'
}

sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.

Expand Down Expand Up @@ -59,20 +63,13 @@ buildConfig {
appName = config.mod_name
main {
buildConfigField "String", "acceptedVersions", config.accepted_versions
if (project.hasProperty('signingKeystore')) {
buildConfigField "String", "fingerprint", signingFingerprint
buildConfigField "String", "updateJSON",
config.update_url +
'?mod_version=' + project.version +
'&mc_version=' + project.minecraft.version +
'&signature=' + signingFingerprint
} else {
buildConfigField "String", "fingerprint", project.findProperty('signingFingerprint')
buildConfigField "String", "updateJSON",
config.update_url +
'?mod_version=' + project.version +
'&mc_version=' + project.minecraft.version
buildConfigField "String", "fingerprint", "unsigned"
}
'?mkver=' + config.mod_version +
'&mcver=' + config.mc_version +
'&fmver=' + config.forge_version +
'&fngpt=' + project.findProperty('signingFingerprint')
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mod_version=1.12.x-2.0.0-DEV
mod_version=2.0.0
mod_name=MacroKey Keybinding
mod_group=com.mattsmeets.macrokey
mc_version=1.12
forge_version=14.21.1.2387
update_url=http://mod-versioning.mattsmeets.com/macrokey.json
accepted_versions=[1.12,1.12.2]
accepted_versions=[1.12,1.12.2]