From 31ef9ab7f7c3e6269b8ab3604fb3628b04cad6ed Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@gmail.com>
Date: Thu, 4 Jul 2024 07:22:21 +0200
Subject: [PATCH] Downgrade AGP to 8.0.2 cause of problems on Android 4.x

---
 build.gradle                                                | 3 ++-
 common/build.gradle                                         | 6 ------
 .../constellation/orion/viewer/prefs/OrionEditPreference.kt | 2 +-
 orion-viewer/version.properties                             | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 03b436cc1..bbcd3aef3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        //Don't upgrade AGP until https://issuetracker.google.com/issues/302826300 and https://issuetracker.google.com/issues/350946989
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
diff --git a/common/build.gradle b/common/build.gradle
index bd7d423b6..91e30c96a 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -8,12 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 14
     }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
 
     namespace 'universe.constellation.orion.common'
     compileOptions {
diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/prefs/OrionEditPreference.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/prefs/OrionEditPreference.kt
index 22f924d85..490a435e7 100644
--- a/orion-viewer/src/main/java/universe/constellation/orion/viewer/prefs/OrionEditPreference.kt
+++ b/orion-viewer/src/main/java/universe/constellation/orion/viewer/prefs/OrionEditPreference.kt
@@ -91,7 +91,7 @@ open class OrionEditTextPreference @JvmOverloads constructor(
                 it,
                 R.styleable.universe_constellation_orion_viewer_prefs_OrionEditTextPreference_maxValue
             )
-            it.close()
+            it.recycle()
         }
 
         if (pattern != null || minValue != null || maxValue != null) {
diff --git a/orion-viewer/version.properties b/orion-viewer/version.properties
index cc242a0a9..2d509eae8 100644
--- a/orion-viewer/version.properties
+++ b/orion-viewer/version.properties
@@ -1,2 +1,2 @@
-orion.version.code=2354
-orion.version.name=0.94.4
\ No newline at end of file
+orion.version.code=2358
+orion.version.name=0.94.5Beta
\ No newline at end of file