Merge pull request #45 from Crazy-Marvin/development

Halma 6.0

.gitattributes

@@ -0,0 +1 @@
+*.properties encoding=utf-8

.github/CONTACT.md

@@ -0,0 +1,5 @@
+Welcome to the Halma community.
+
+Within desired privacy, accept and grant criticism constructively.
+
+Finding yourself unable to do so, e-mail [email protected] answered by Crazy Marvin, the project maintainer.

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"

.gitignore

@@ -17,8 +17,7 @@ gwt-unitCache/
 www-test/
 .gwt-tmp/
 
-## Android Studio and Intellij and Android in general
-/android/libs/armeabi/
+## Android Studio and Intellij
 /android/libs/armeabi-v7a/
 /android/libs/arm64-v8a/
 /android/libs/x86/
@@ -41,7 +40,6 @@ com_crashlytics_export_strings.xml
 /desktop/bin/
 /html/bin/
 /ios/bin/
-/ios-moe/bin/
 *.tmp
 *.bak
 *.swp
@@ -59,43 +57,42 @@ com_crashlytics_export_strings.xml
 /desktop/nbproject/private/
 /html/nbproject/private/
 /ios/nbproject/private/
-/ios-moe/nbproject/private/
 
 /build/
 /android/build/
 /core/build/
 /desktop/build/
 /html/build/
 /ios/build/
-/ios-moe/build/
 
 /nbbuild/
 /android/nbbuild/
 /core/nbbuild/
 /desktop/nbbuild/
 /html/nbbuild/
 /ios/nbbuild/
-/ios-moe/nbbuild/
 
 /dist/
 /android/dist/
 /core/dist/
 /desktop/dist/
 /html/dist/
 /ios/dist/
-/ios-moe/dist/
 
 /nbdist/
 /android/nbdist/
 /core/nbdist/
 /desktop/nbdist/
 /html/nbdist/
 /ios/nbdist/
-/ios-moe/nbdist/
 
 nbactions.xml
 nb-configuration.xml
 
+## Visual Studio Code
+
+.vscode/
+
 ## Gradle
 
 /local.properties
@@ -107,7 +104,6 @@ gradle-app.setting
 /desktop/build/
 /html/build/
 /ios/build/
-/ios-moe/build/
 
 ## OS Specific
 .DS_Store
@@ -120,8 +116,3 @@ Thumbs.db
 /ios/xcode/native/
 /ios/IOSLauncher.app
 /ios/IOSLauncher.app.dSYM
-
-/ios-moe/xcode/*.xcodeproj/*
-!/ios-moe/xcode/*.xcodeproj/xcshareddata
-!/ios-moe/xcode/*.xcodeproj/project.pbxproj
-/ios-moe/xcode/native/

README.md

@@ -8,7 +8,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/1bc4318b13c04d6d994fca383e9a1bee)](https://www.codacy.com/gh/Crazy-Marvin/Halma/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Crazy-Marvin/Halma&utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/Crazy-Marvin/Halma/branch/master/graph/badge.svg?token=sErYkIqHmc)](https://codecov.io/gh/Crazy-Marvin/Halma)
 [![Hosted Weblate](https://hosted.weblate.org/widgets/halma/-/svg-badge.svg)](https://hosted.weblate.org/engage/halma/)
-![Known Vulnerabilities](https://snyk.io/test/github/Crazy-Marvin/Halma/badge.svg)
+[![Known Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/Crazy-Marvin/Halma)](https://snyk.io/)
 [![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19)
 [![F-Droid](https://img.shields.io/f-droid/v/rocks.poopjournal.halma.svg)](https://f-droid.org/en/packages/rocks.poopjournal.halma/)
 [![Google Play](https://badgen.net/badge/icon/googleplay?icon=googleplay&label)](https://play.google.com/store/apps/details?id=rocks.poopjournal.halma)

android/AndroidManifest.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="rocks.poopjournal.halma" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="app.halma">
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/icon_launcher"
+        android:fullBackupContent="true"
+        android:icon="@mipmap/ic_launcher"
         android:isGame="true"
         android:appCategory="game"
         android:label="@string/app_name"
-        android:theme="@style/GdxTheme" >
+        tools:ignore="UnusedAttribute">
         <activity
-            android:name="rocks.poopjournal.halma.AndroidLauncher"
+            android:name="app.halma.AndroidLauncher"
             android:label="@string/app_name" 
             android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
+            android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

android/build.gradle

@@ -1,14 +1,14 @@
 android {
-    buildToolsVersion "29.0.2"
-    compileSdkVersion 29
+    buildToolsVersion "31.0.0"
+    compileSdkVersion 31
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             aidl.srcDirs = ['src']
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
+            assets.srcDirs = ['../assets']
             jniLibs.srcDirs = ['libs']
         }
 
@@ -17,11 +17,11 @@ android {
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
     defaultConfig {
-        applicationId "rocks.poopjournal.halma"
+        applicationId "app.halma"
         minSdkVersion 14
-        targetSdkVersion 29
-        versionCode 5
-        versionName "5.0"
+        targetSdkVersion 31
+        versionCode 6
+        versionName "6.0"
     }
     buildTypes {
         release {
@@ -37,17 +37,15 @@ android {
 // so they get packed with the APK.
 task copyAndroidNatives {
     doFirst {
-        file("libs/armeabi/").mkdirs()
         file("libs/armeabi-v7a/").mkdirs()
         file("libs/arm64-v8a/").mkdirs()
         file("libs/x86_64/").mkdirs()
         file("libs/x86/").mkdirs()
 
-        configurations.natives.files.each { jar ->
+        configurations.natives.copy().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) {
@@ -62,7 +60,7 @@ task copyAndroidNatives {
 }
 
 tasks.whenTaskAdded { packageTask ->
-    if (packageTask.name.contains("package")) {
+    if (packageTask.name.contains("merge") && packageTask.name.contains("JniLibFolders")) {
         packageTask.dependsOn 'copyAndroidNatives'
     }
 }
@@ -86,7 +84,7 @@ task run(type: Exec) {
     }
 
     def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.martinzky.halma/com.martinzky.halma.AndroidLauncher'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'app.halma/app.halma.AndroidLauncher'
 }
 
-eclipse.project.name = appName + "-android"
+eclipse.project.name = appName + "-android"