Skip to content

Commit

Permalink
tidy build.gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
tdhargraves committed Feb 4, 2023
1 parent 401b51c commit f1acdaf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
build/
release/
local.properties
*.dll

19 changes: 4 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ plugins {
}

android {
compileSdkVersion 31
buildToolsVersion "30.0.3"
compileSdk 31

defaultConfig {
applicationId "com.tharg.ninja"
Expand All @@ -13,8 +12,6 @@ android {
versionCode 1
versionName "1.0"
multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand Down Expand Up @@ -42,17 +39,9 @@ android {
}

dependencies {
// The latest versions are not compatible with Android API 31
// implementation 'androidx.appcompat:appcompat:1.6.0' - requires API 33
// implementation 'com.google.android.material:material:1.8.0'- requires API 32
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

// implementation 'androidx.appcompat:appcompat:1.6.0'
// implementation 'com.google.android.material:material:1.7.0'
//
// testImplementation 'junit:junit:4.13.2'
// androidTestImplementation 'androidx.test.ext:junit:1.1.5'
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
15 changes: 4 additions & 11 deletions desktop/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// To run: open cmd window in root directory, and enter commend:
// .\gradlew :desktop:DesktopLauncher

apply plugin: "java"
apply plugin: "application"
sourceSets.main.java.srcDirs = ["src/main/java"]
dependencies {
}

jar {
manifest {
attributes 'Main-Class': "com.tharg.ninja.DesktopLauncher"
Expand All @@ -13,20 +15,11 @@ tasks.register('DesktopLauncher', JavaExec) {
mainClass = 'com.tharg.ninja.DesktopLauncher'
}
tasks.withType(JavaExec) { // Java runtime options:

// args '--showSettingsDialog'
// args '--verbose' // to enable additional log output
classpath sourceSets.main.runtimeClasspath
enableAssertions false
// jvmArgs '-verbose:gc'
// jvmArgs '-Xcheck:jni'
jvmArgs '-Xms1024m', '-Xmx1024m'
// jvmArgs '-XX:+UseG1GC', '-XX:MaxGCPauseMillis=10'
}

// Run from cmd window in root directory
// gradle :desktop:DesktopLauncher

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand Down
3 changes: 1 addition & 2 deletions utilities/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
}

sourceCompatibility = 1.8
//mainClassName = "com.tharg.jme.utilities.createj3o.CreateJ3o"

repositories {
mavenLocal()
Expand All @@ -30,7 +29,7 @@ project(":assets") {
}

dependencies {
implementation files('Wes-0.7.2.jar')
implementation "org.jmonkeyengine:jme3-core:3.6.0-SNAPSHOT"
}

java.targetCompatibility = JavaVersion.VERSION_1_8

0 comments on commit f1acdaf

Please sign in to comment.