Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ ext {
}

java {
sourceCompatibility(JavaVersion.VERSION_17)
targetCompatibility(JavaVersion.VERSION_17)
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
Expand All @@ -54,25 +54,25 @@ repositories {
def repoViaEnv = System.getenv()["RESOLUTION_REPO"]
if (rootProject.hasProperty("alternativeResolutionRepo")) {
// If the user supplies an alternative repo via gradle.properties then use that
name "from alternativeResolutionRepo property"
url alternativeResolutionRepo
name = "from alternativeResolutionRepo property"
url = alternativeResolutionRepo
} else if (repoViaEnv != null && repoViaEnv != "") {
name "from \$RESOLUTION_REPO"
name = "from \$RESOLUTION_REPO"
url = repoViaEnv
} else {
// Our default is the main virtual repo containing everything except repos for testing Artifactory itself
name "Terasology Artifactory"
url "https://artifactory.terasology.io/artifactory/virtual-repo-live"
name = "Terasology Artifactory"
url = "https://artifactory.terasology.io/artifactory/virtual-repo-live"
}
}
}

group = 'org.terasology.jnbullet'

dependencies {
api group: 'org.joml', name: 'joml', version: '1.9.25'
api group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
api "org.joml:joml:1.9.25"
api "net.sf.trove4j:trove4j:3.0.3"
implementation "org.slf4j:slf4j-api:1.7.21"
}

sourceSets {
Expand Down Expand Up @@ -155,7 +155,7 @@ task listNatives{

// TODO: outputs are not defined well enough yet for Gradle to skip this if already done (maybe more the natives task?)
task zipNatives(type: Zip){
description 'Creates a zip archive that contains all TeraBullet native files'
description = 'Creates a zip archive that contains all TeraBullet native files'
allNatives.each { module ->
from ("$rootDir/build/natives/${module}") {
include '*linux*'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading