diff options
| author | ilotterytea <iltsu@alright.party> | 2022-10-19 22:06:16 +0600 |
|---|---|---|
| committer | ilotterytea <iltsu@alright.party> | 2022-10-19 22:06:16 +0600 |
| commit | bac4182ef9d1df55b3e2daad8be82f966a92b0dd (patch) | |
| tree | e08143c54939c527a931fd23690f8fd6e73fc2b4 /build.gradle | |
| parent | 2434fafcdb07521c0db76037483d0c36c4280c2e (diff) | |
| parent | c792b675e340ade7e4fd6bd4e67265ba2b4cb1b5 (diff) | |
Resolved merge conflict
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle index c2ff7d5..52755bf 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { google() } dependencies { - //classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.2.0' } } @@ -17,7 +17,7 @@ buildscript { allprojects { apply plugin: "eclipse" - version = '1.1' + version = '1.2' ext { appName = "Maxon Petting Simulator" gdxVersion = '1.11.0' @@ -49,11 +49,15 @@ project(":desktop") { implementation project(":core") api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" - + api "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion" + api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop" + api "de.golfgl.gdxgamesvcs:gdx-gamesvcs-core-gamejolt:1.1.0" + api "de.tomgrill.gdxdialogs:gdx-dialogs-desktop:1.3.0" + } } -/*project(":android") { +project(":android") { apply plugin: "com.android.application" configurations { natives } @@ -65,9 +69,19 @@ project(":desktop") { natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" - + api "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion" + api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" + api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion" + api "com.badlogicgames.gdx:gdx-ai:$aiVersion" + api "com.badlogicgames.ashley:ashley:$ashleyVersion" + api "de.golfgl.gdxgamesvcs:gdx-gamesvcs-android-gpgs:1.1.0" + api "de.tomgrill.gdxdialogs:gdx-dialogs-android:1.3.0" } -}*/ +} project(":core") { apply plugin: "java-library" @@ -75,9 +89,15 @@ project(":core") { dependencies { api "com.badlogicgames.gdx:gdx:$gdxVersion" + api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion" + api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion" + api "com.badlogicgames.gdx:gdx-ai:$aiVersion" + api "com.badlogicgames.ashley:ashley:$ashleyVersion" + api "de.golfgl.gdxgamesvcs:gdx-gamesvcs-core:1.1.0" + api "de.tomgrill.gdxdialogs:gdx-dialogs-core:1.3.0" api "com.rafaskoberg.gdx:typing-label:$typingLabelVersion" implementation 'com.google.code.gson:gson:2.9.1' - implementation 'org.apache.logging.log4j:log4j-api:2.18.0' - implementation 'org.apache.logging.log4j:log4j-core:2.18.0' + implementation 'ch.qos.logback:logback-classic:1.2.10' } } |