Prepare for F-Droid submission

toasterofbread · Oct 3, 2023 · 0546e9b · 0546e9b
1 parent 34538c6
commit 0546e9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -100,7 +100,7 @@ android {
 
     splits {
         abi {
-            isEnable = true
+            isEnable = project.hasProperty("enableApkSplit")
             reset()
 
             isUniversalApk = true

diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro
@@ -32,6 +32,9 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
 
+# F-Droid
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
 # ???
 -dontwarn java.awt.AWTEvent
 -dontwarn java.awt.Component

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,6 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
         google()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 
     plugins {
@@ -33,9 +32,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven("https://jitpack.io")
-        maven("https://gitlab.com/api/v4/projects/26729549/packages/maven")
     }
 }
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -31,6 +31,7 @@ val DEBUG_KEY_NAMES = mapOf(
 
 val buildConfigDir: Provider<Directory> get() = project.layout.buildDirectory.dir("generated/buildconfig")
 
+
 fun GenerateBuildConfig.buildConfig(debug: Boolean) {
     val keys = Properties()
 
@@ -176,7 +177,7 @@ kotlin {
         val desktopMain by getting {
             dependencies {
                 implementation(compose.desktop.common)
-                implementation("com.github.bluemods:kxml2:4dae70b2a995e72f842eca0c778792ce90d6cfc7")
+//                implementation("com.github.bluemods:kxml2:4dae70b2a995e72f842eca0c778792ce90d6cfc7")
                 implementation("org.zeromq:jeromq:0.5.3")
                 implementation("com.github.ltttttttttttt:load-the-image:1.0.5")
             }