mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-12-22 23:04:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to 'implementation' / 'api'

Browse Source
This commit is contained in:
Anuken 2020-05-12 12:31:09 -04:00
parent 0663d8067a
commit fe9df51721
7 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/build.gradle
View File

@ -1,5 +1,3 @@
apply plugin: "java"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = ["src/main/java/"] sourceSets.main.java.srcDirs = ["src/main/java/"]
sourceSets.main.resources.srcDirs = ["src/main/resources/"] sourceSets.main.resources.srcDirs = ["src/main/resources/"]

76
build.gradle
View File

@ -166,17 +166,17 @@ project(":desktop"){
compileJava.options.compilerArgs += ["-XDignore.symbol.file"] compileJava.options.compilerArgs += ["-XDignore.symbol.file"]
dependencies{ dependencies{
compile project(":core") implementation project(":core")
compile arcModule("natives:natives-box2d-desktop") implementation arcModule("natives:natives-box2d-desktop")
compile arcModule("natives:natives-desktop") implementation arcModule("natives:natives-desktop")
compile arcModule("natives:natives-freetype-desktop") implementation arcModule("natives:natives-freetype-desktop")
if(debugged()) compile project(":debug") if(debugged()) implementation project(":debug")
compile "com.github.Anuken:steamworks4j:$steamworksVersion" implementation "com.github.Anuken:steamworks4j:$steamworksVersion"
compile arcModule("backends:backend-sdl") implementation arcModule("backends:backend-sdl")
compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1' implementation 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
} }
} }
@ -202,19 +202,19 @@ project(":ios"){
} }
dependencies{ dependencies{
compile project(":core") implementation project(":core")
compile arcModule("natives:natives-ios") implementation arcModule("natives:natives-ios")
compile arcModule("natives:natives-freetype-ios") implementation arcModule("natives:natives-freetype-ios")
compile arcModule("natives:natives-box2d-ios") implementation arcModule("natives:natives-box2d-ios")
compile arcModule("backends:backend-robovm") implementation arcModule("backends:backend-robovm")
compileOnly project(":annotations") compileOnly project(":annotations")
} }
} }
project(":core"){ project(":core"){
apply plugin: "java" apply plugin: "java-library"
task preGen{ task preGen{
outputs.upToDateWhen{ false } outputs.upToDateWhen{ false }
@ -247,15 +247,15 @@ project(":core"){
dependencies{ dependencies{
compileJava.dependsOn(preGen) compileJava.dependsOn(preGen)
compile "org.lz4:lz4-java:1.4.1" api "org.lz4:lz4-java:1.4.1"
compile arcModule("arc-core") api arcModule("arc-core")
compile arcModule("extensions:freetype") api arcModule("extensions:freetype")
compile arcModule("extensions:box2d") api arcModule("extensions:box2d")
compile arcModule("extensions:g3d") api arcModule("extensions:g3d")
compile arcModule("extensions:fx") api arcModule("extensions:fx")
compile arcModule("extensions:arcnet") api arcModule("extensions:arcnet")
compile "org.mozilla:rhino-runtime:1.7.12" api "org.mozilla:rhino-runtime:1.7.12"
if(localArc() && debugged()) compile arcModule("extensions:recorder") if(localArc() && debugged()) api arcModule("extensions:recorder")
compileOnly project(":annotations") compileOnly project(":annotations")
annotationProcessor project(":annotations") annotationProcessor project(":annotations")
@ -266,9 +266,9 @@ project(":server"){
apply plugin: "java" apply plugin: "java"
dependencies{ dependencies{
compile project(":core") implementation project(":core")
compile arcModule("natives:natives-box2d-desktop") implementation arcModule("natives:natives-box2d-desktop")
compile arcModule("backends:backend-headless") implementation arcModule("backends:backend-headless")
} }
} }
@ -279,9 +279,9 @@ project(":tests"){
testImplementation project(":core") testImplementation project(":core")
testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1" testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1" testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
testImplementation arcModule("backends:backend-headless")
testImplementation arcModule("natives:natives-box2d-desktop")
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
compile arcModule("backends:backend-headless")
compile arcModule("natives:natives-box2d-desktop")
} }
test{ test{
@ -297,24 +297,24 @@ project(":tools"){
apply plugin: "java" apply plugin: "java"
dependencies{ dependencies{
compile project(":core") implementation project(":core")
compile arcModule("natives:natives-desktop") implementation arcModule("natives:natives-desktop")
compile arcModule("natives:natives-freetype-desktop") implementation arcModule("natives:natives-freetype-desktop")
compile arcModule("natives:natives-box2d-desktop") implementation arcModule("natives:natives-box2d-desktop")
compile arcModule("backends:backend-headless") implementation arcModule("backends:backend-headless")
compile "org.reflections:reflections:0.9.12" implementation "org.reflections:reflections:0.9.12"
} }
} }
project(":annotations"){ project(":annotations"){
apply plugin: "java" apply plugin: "java-library"
dependencies{ dependencies{
compile 'com.squareup:javapoet:1.12.1' implementation 'com.squareup:javapoet:1.12.1'
compile "com.github.Anuken.Arc:arc-core:$arcHash" implementation "com.github.Anuken.Arc:arc-core:$arcHash"
compile files("${System.getProperty('java.home')}/../lib/tools.jar") implementation files("${System.getProperty('java.home')}/../lib/tools.jar")
} }
} }

1
core/build.gradle
View File

@ -1,4 +1,3 @@
apply plugin: "java"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"] sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"]

2
desktop/build.gradle
View File

@ -4,8 +4,6 @@ import com.badlogicgames.packr.PackrConfig
import java.nio.ByteBuffer import java.nio.ByteBuffer
import java.security.MessageDigest import java.security.MessageDigest
apply plugin: "java"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = [ "src/" ] sourceSets.main.java.srcDirs = [ "src/" ]

2
server/build.gradle
View File

@ -1,5 +1,3 @@
apply plugin: "java"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = ["src/"] sourceSets.main.java.srcDirs = ["src/"]

4
tests/build.gradle
View File

@ -1,5 +1 @@
apply plugin: "java"
sourceCompatibility = 1.8
sourceSets.test.resources.srcDirs = ["src/test/resources"] sourceSets.test.resources.srcDirs = ["src/test/resources"]

2
tools/build.gradle
View File

@ -1,5 +1,3 @@
apply plugin: "java"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = ["src/"] sourceSets.main.java.srcDirs = ["src/"]