Merge branch 'main' of github.com:Lost-Fly/PackAndGo-AndroidMultiplay…

…erGame
Lost-Fly · May 28, 2024 · bbf0982 · bbf0982
2 parents 5e1a5a1 + 06072db
commit bbf0982
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 9 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -25,4 +25,4 @@ jobs:
         run: chmod +x gradlew  
 
       - name: Build with Gradle
-        run: ./gradlew clean build  
+        run: ./gradlew clean build -PexcludeTask=minifyReleaseWithR8 --stacktrace
diff --git a/README.md b/README.md
@@ -44,10 +44,13 @@ ____
 - JUnit для unit-тестирования.
 
 ### Визуал:
-![image](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/c9d506ef-df41-4859-a304-031890b5d618)
-![image](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/145f07ab-f950-46d8-9a2d-5481d05e582d)
-![image](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/bbc8c38c-f09c-41ad-a7c5-85e4b9ff8eff)
-![image](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/5cdd4b60-ce08-44b2-a394-3b9e16eb7426)
+![-2147483648_-211552](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/0f41fda1-cb70-4598-bc32-b8367a243e31)
+![-2147483648_-211556](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/b705ab1b-7643-4550-9681-03633dd74f68)
+![-2147483648_-211562](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/619be0ce-c988-45cf-a2d8-b65fbb9ab496)
+![-2147483648_-211558](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/55cb9141-842c-47b0-aa5b-03a1ac139669)
+![-2147483648_-211560](https://github.com/Lost-Fly/PackAndGo-AndroidMultiplayerGame/assets/114507453/490b7ffc-6288-4010-8491-d540ed117925)
+
+
 
 
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -26,10 +26,21 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled false
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    // buildTypes {
+    //     release {
+    //         if (project.hasProperty('excludeMinifyTask') && project.excludeMinifyTask.toBoolean()) {
+    //             minifyEnabled false
+    //         } else {
+    //             minifyEnabled true
+    //             useProguard true
+    //             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+    //         }
+    //     }
+    // }
 }
 
 

diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
@@ -36,3 +36,16 @@
    boolean reportFixture(long);
    float   reportRayFixture(long, float, float, float, float, float);
 }
+
+# Keep Jackson annotations
+-keepattributes *Annotation*
+# Retain annotation for @ConstructorProperties
+-keep class java.beans.ConstructorProperties { *; }
+-keep class org.slf4j.impl.StaticLoggerBinder { *; }
+
+# Jackson module-parameter-names
+-keepnames class com.fasterxml.jackson.** { *; }
+-keepclassmembers class com.fasterxml.jackson.** { *; }
+
+# Keep SLF4J
+-keep class org.slf4j.** { *; }
diff --git a/build.gradle b/build.gradle
@@ -68,14 +68,17 @@ project(":android") {
 project(":core") {
     apply plugin: "java-library"
 
-
     dependencies {
         api "com.badlogicgames.gdx:gdx:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
         api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
         implementation 'org.java-websocket:Java-WebSocket:1.5.2'
         implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
+        implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
+        implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.3'
+        implementation 'org.slf4j:slf4j-api:1.7.30'
+        implementation 'org.slf4j:slf4j-simple:1.7.30'
     }
 }
 
@@ -88,5 +91,8 @@ project(":android") {
         api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
         implementation 'org.java-websocket:Java-WebSocket:1.5.2'
         implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
+        implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.0'
+        implementation 'org.slf4j:slf4j-api:1.7.30'
+        implementation 'org.slf4j:slf4j-simple:1.7.30'
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
-include 'android', 'core'
+include 'android', 'core'
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		include 'android', 'core'
		include 'android', 'core'