mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	build.gradle.kts
This commit is contained in:
dfsek
2020-12-08 20:12:09 -07:00
parent 8f5a9b7b8e bb5552c8bc
commit 11cb11bc2b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -25,7 +25,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}
val versionObj = Version("2", "1", "0", true)
val versionObj = Version("2", "0", "2", true)
version = versionObj
@@ -63,7 +63,7 @@ val compileJava: JavaCompile by tasks
val mainSourceSet: SourceSet = sourceSets["main"]
tasks.withType<ProcessResources> {
include("*.yml")
include("**/*.yml")
filter<org.apache.tools.ant.filters.ReplaceTokens>(
"tokens" to mapOf(
"VERSION" to project.version.toString()