From c61b4827c16d5dd2805f9bdaa75b1726d79c4be7 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Thu, 5 Sep 2019 16:48:14 +0200 Subject: [PATCH] Auto reformat the entire codebase --- android/build.gradle | 22 ++-- .../dev/lonami/klooni/AndroidLauncher.java | 2 +- core/build.gradle | 2 +- core/src/Klooni.gwt.xml | 7 +- desktop/build.gradle | 24 ++-- .../klooni/desktop/DesktopLauncher.java | 3 +- ios/Info.plist.xml | 106 +++++++++--------- ios/build.gradle | 6 +- ios/robovm.xml | 91 +++++++-------- ios/src/dev/lonami/klooni/IOSLauncher.java | 7 +- 10 files changed, 136 insertions(+), 134 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 48a5833..58f9da5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,7 +32,7 @@ android { // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. -task copyAndroidNatives() { +task copyAndroidNatives() { file("libs/armeabi/").mkdirs() file("libs/armeabi-v7a/").mkdirs() file("libs/arm64-v8a/").mkdirs() @@ -41,12 +41,12 @@ task copyAndroidNatives() { configurations.natives.files.each { jar -> def outputDir = null - if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") - if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") - if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") - if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") - if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") - if(outputDir != null) { + if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") + if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") + if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") + if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") + if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") + if (outputDir != null) { copy { from zipTree(jar) into outputDir @@ -94,8 +94,8 @@ eclipse { } classpath { - plusConfigurations += [ project.configurations.compile ] - containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' + plusConfigurations += [project.configurations.compile] + containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' } project { @@ -113,7 +113,7 @@ eclipse { idea { module { sourceDirs += file("src") - scopes = [ COMPILE: [plus:[project.configurations.compile]]] + scopes = [COMPILE: [plus: [project.configurations.compile]]] iml { withXml { @@ -123,7 +123,7 @@ idea { builder.component(name: "FacetManager") { facet(type: "android", name: "Android") { configuration { - option(name: "UPDATE_PROPERTY_FILES", value:"true") + option(name: "UPDATE_PROPERTY_FILES", value: "true") } } } diff --git a/android/src/dev/lonami/klooni/AndroidLauncher.java b/android/src/dev/lonami/klooni/AndroidLauncher.java index 166dc9e..319fa58 100644 --- a/android/src/dev/lonami/klooni/AndroidLauncher.java +++ b/android/src/dev/lonami/klooni/AndroidLauncher.java @@ -24,7 +24,7 @@ import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; public class AndroidLauncher extends AndroidApplication { @Override - protected void onCreate (Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); final AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); final AndroidShareChallenge shareChallenge = new AndroidShareChallenge(this); diff --git a/core/build.gradle b/core/build.gradle index 03cd1be..94f35a8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,7 +3,7 @@ apply plugin: "java" sourceCompatibility = 1.6 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' -sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.java.srcDirs = ["src/"] eclipse.project { diff --git a/core/src/Klooni.gwt.xml b/core/src/Klooni.gwt.xml index 0c2b575..8499639 100644 --- a/core/src/Klooni.gwt.xml +++ b/core/src/Klooni.gwt.xml @@ -1,5 +1,6 @@ - - + - + \ No newline at end of file diff --git a/desktop/build.gradle b/desktop/build.gradle index d85347e..4c493a0 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,7 +1,7 @@ apply plugin: "java" sourceCompatibility = 1.6 -sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.java.srcDirs = ["src/"] project.ext.mainClassName = "dev.lonami.klooni.desktop.DesktopLauncher" project.ext.assetsDir = new File("../android/assets") @@ -17,9 +17,9 @@ task run(dependsOn: classes, type: JavaExec) { task dist(type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) - from {configurations.compile.collect {zipTree(it)}} + from { configurations.compile.collect { zipTree(it) } } from files(project.assetsDir) - + manifest { attributes 'Main-Class': project.mainClassName } @@ -35,13 +35,13 @@ eclipse { } task afterEclipseImport(description: "Post processing after project generation", group: "IDE") { - doLast { - def classpath = new XmlParser().parse(file(".classpath")) - // Result of "new" was being ignored - // new Node(classpath, "classpathentry", [ kind: 'src', path: 'assets' ]); - def writer = new FileWriter(file(".classpath")) - def printer = new XmlNodePrinter(new PrintWriter(writer)) - printer.setPreserveWhitespace(true) - printer.print(classpath) - } + doLast { + def classpath = new XmlParser().parse(file(".classpath")) + // Result of "new" was being ignored + // new Node(classpath, "classpathentry", [ kind: 'src', path: 'assets' ]); + def writer = new FileWriter(file(".classpath")) + def printer = new XmlNodePrinter(new PrintWriter(writer)) + printer.setPreserveWhitespace(true) + printer.print(classpath) + } } \ No newline at end of file diff --git a/desktop/src/dev/lonami/klooni/desktop/DesktopLauncher.java b/desktop/src/dev/lonami/klooni/desktop/DesktopLauncher.java index ee36c78..cba0df6 100644 --- a/desktop/src/dev/lonami/klooni/desktop/DesktopLauncher.java +++ b/desktop/src/dev/lonami/klooni/desktop/DesktopLauncher.java @@ -20,10 +20,11 @@ package dev.lonami.klooni.desktop; import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; + import dev.lonami.klooni.Klooni; class DesktopLauncher { - public static void main (String[] arg) { + public static void main(String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.title = "Klooni 1010!"; config.width = Klooni.GAME_WIDTH; diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 407bec7..95b7239 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -1,59 +1,59 @@ - - + - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${app.name} - CFBundleExecutable - ${app.executable} - CFBundleIdentifier - ${app.id} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${app.name} - CFBundlePackageType - APPL - CFBundleShortVersionString - ${app.version} - CFBundleSignature - ???? - CFBundleVersion - ${app.build} - LSRequiresIPhoneOS - - UIViewControllerBasedStatusBarAppearance - - UIStatusBarHidden - - UIDeviceFamily - - 1 - 2 - - UIRequiredDeviceCapabilities - - armv7 - opengles-2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CFBundleIcons - CFBundlePrimaryIcon + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${app.name} + CFBundleExecutable + ${app.executable} + CFBundleIdentifier + ${app.id} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${app.name} + CFBundlePackageType + APPL + CFBundleShortVersionString + ${app.version} + CFBundleSignature + ???? + CFBundleVersion + ${app.build} + LSRequiresIPhoneOS + + UIViewControllerBasedStatusBarAppearance + + UIStatusBarHidden + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + armv7 + opengles-2 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CFBundleIcons - CFBundleIconFiles - - Icon - Icon-72 - + CFBundlePrimaryIcon + + CFBundleIconFiles + + Icon + Icon-72 + + - diff --git a/ios/build.gradle b/ios/build.gradle index cd685f0..74dba2a 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -1,10 +1,10 @@ -sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.java.srcDirs = ["src/"] sourceCompatibility = '1.7' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' ext { - mainClassName = "dev.lonami.klooni.IOSLauncher" + mainClassName = "dev.lonami.klooni.IOSLauncher" } launchIPhoneSimulator.dependsOn build @@ -13,7 +13,7 @@ launchIOSDevice.dependsOn build createIPA.dependsOn build robovm { - archs = "thumbv7:arm64" + archs = "thumbv7:arm64" } eclipse.project { diff --git a/ios/robovm.xml b/ios/robovm.xml index ee0da2d..468a654 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -1,47 +1,48 @@ - ${app.executable} - ${app.mainclass} - ios - thumbv7 - ios - Info.plist.xml - - - ../android/assets - - ** - - true - - - data - - - - com.badlogic.gdx.scenes.scene2d.ui.* - com.badlogic.gdx.graphics.g3d.particles.** - com.android.okhttp.HttpHandler - com.android.okhttp.HttpsHandler - com.android.org.conscrypt.** - com.android.org.bouncycastle.jce.provider.BouncyCastleProvider - com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings - com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi - com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std - com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi - com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL - org.apache.harmony.security.provider.cert.DRLCertFactory - org.apache.harmony.security.provider.crypto.CryptoProvider - - - z - - - UIKit - OpenGLES - QuartzCore - CoreGraphics - OpenAL - AudioToolbox - AVFoundation - + ${app.executable} + ${app.mainclass} + ios + thumbv7 + ios + Info.plist.xml + + + ../android/assets + + ** + + true + + + data + + + + com.badlogic.gdx.scenes.scene2d.ui.* + com.badlogic.gdx.graphics.g3d.particles.** + com.android.okhttp.HttpHandler + com.android.okhttp.HttpsHandler + com.android.org.conscrypt.** + com.android.org.bouncycastle.jce.provider.BouncyCastleProvider + com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings + com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi + com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std + + com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi + com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL + org.apache.harmony.security.provider.cert.DRLCertFactory + org.apache.harmony.security.provider.crypto.CryptoProvider + + + z + + + UIKit + OpenGLES + QuartzCore + CoreGraphics + OpenAL + AudioToolbox + AVFoundation + diff --git a/ios/src/dev/lonami/klooni/IOSLauncher.java b/ios/src/dev/lonami/klooni/IOSLauncher.java index 44857bd..0a6dd4e 100644 --- a/ios/src/dev/lonami/klooni/IOSLauncher.java +++ b/ios/src/dev/lonami/klooni/IOSLauncher.java @@ -17,12 +17,11 @@ */ package dev.lonami.klooni; -import org.robovm.apple.foundation.NSAutoreleasePool; -import org.robovm.apple.uikit.UIApplication; - import com.badlogic.gdx.backends.iosrobovm.IOSApplication; import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration; -import dev.lonami.klooni.Klooni; + +import org.robovm.apple.foundation.NSAutoreleasePool; +import org.robovm.apple.uikit.UIApplication; class IOSLauncher extends IOSApplication.Delegate { @Override