From 25e26058343f00705d4c999e8a1cd6c7df48cfb4 Mon Sep 17 00:00:00 2001 From: machiav3lli <40302595+machiav3lli@users.noreply.github.com> Date: Mon, 7 Jul 2025 18:39:52 +0200 Subject: [PATCH 1/3] Remove BuildConfig from release artifacts --- storage/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts index 7bb03dc..2548473 100644 --- a/storage/build.gradle.kts +++ b/storage/build.gradle.kts @@ -62,3 +62,7 @@ dependencies { testImplementation(libs.powermock.junit4) testImplementation(libs.powermock.api.mockito) } + +afterEvaluate { + tasks.findByName("generateReleaseBuildConfig")?.enabled = false +} From 3eb81dc056a86814d8ef1b0757203f5eb85df8a6 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Wed, 16 Jul 2025 01:04:03 +0200 Subject: [PATCH 2/3] Remove: BuildConfig from debug artifacts (assurance for parity of debug and release builds) --- storage/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts index 2548473..0219a49 100644 --- a/storage/build.gradle.kts +++ b/storage/build.gradle.kts @@ -65,4 +65,5 @@ dependencies { afterEvaluate { tasks.findByName("generateReleaseBuildConfig")?.enabled = false + tasks.findByName("generateDebugBuildConfig")?.enabled = false } From 3181c66e0877a2459af9998aa667741feb99c689 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Wed, 16 Jul 2025 01:02:33 +0200 Subject: [PATCH 3/3] Remove: BuildConfig usage --- .../com/anggrayudi/storage/SimpleStorage.kt | 18 +++++++++--------- .../anggrayudi/storage/SimpleStorageHelper.kt | 7 ++++--- .../anggrayudi/storage/SimpleStorageTest.kt | 3 ++- .../storage/file/DocumentFileCompatTest.kt | 4 ++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt b/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt index e547662..6bb2e47 100644 --- a/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt +++ b/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt @@ -657,23 +657,23 @@ class SimpleStorage private constructor(private val wrapper: ComponentWrapper) { } companion object { - + const val LIBRARY_PACKAGE_NAME = "com.anggrayudi.storage" private const val KEY_REQUEST_CODE_STORAGE_ACCESS = - BuildConfig.LIBRARY_PACKAGE_NAME + ".requestCodeStorageAccess" + LIBRARY_PACKAGE_NAME + ".requestCodeStorageAccess" private const val KEY_REQUEST_CODE_FOLDER_PICKER = - BuildConfig.LIBRARY_PACKAGE_NAME + ".requestCodeFolderPicker" + LIBRARY_PACKAGE_NAME + ".requestCodeFolderPicker" private const val KEY_REQUEST_CODE_FILE_PICKER = - BuildConfig.LIBRARY_PACKAGE_NAME + ".requestCodeFilePicker" + LIBRARY_PACKAGE_NAME + ".requestCodeFilePicker" private const val KEY_REQUEST_CODE_CREATE_FILE = - BuildConfig.LIBRARY_PACKAGE_NAME + ".requestCodeCreateFile" + LIBRARY_PACKAGE_NAME + ".requestCodeCreateFile" private const val KEY_REQUEST_CODE_FRAGMENT_PICKER = - BuildConfig.LIBRARY_PACKAGE_NAME + ".requestCodeFragmentPicker" + LIBRARY_PACKAGE_NAME + ".requestCodeFragmentPicker" private const val KEY_EXPECTED_STORAGE_TYPE_FOR_ACCESS_REQUEST = - BuildConfig.LIBRARY_PACKAGE_NAME + ".expectedStorageTypeForAccessRequest" + LIBRARY_PACKAGE_NAME + ".expectedStorageTypeForAccessRequest" private const val KEY_EXPECTED_BASE_PATH_FOR_ACCESS_REQUEST = - BuildConfig.LIBRARY_PACKAGE_NAME + ".expectedBasePathForAccessRequest" + LIBRARY_PACKAGE_NAME + ".expectedBasePathForAccessRequest" private const val KEY_LAST_VISITED_FOLDER = - BuildConfig.LIBRARY_PACKAGE_NAME + ".lastVisitedFolder" + LIBRARY_PACKAGE_NAME + ".lastVisitedFolder" private const val TAG = "SimpleStorage" private const val DEFAULT_REQUEST_CODE_STORAGE_ACCESS: Int = 1 diff --git a/storage/src/main/java/com/anggrayudi/storage/SimpleStorageHelper.kt b/storage/src/main/java/com/anggrayudi/storage/SimpleStorageHelper.kt index bf1432e..258f820 100644 --- a/storage/src/main/java/com/anggrayudi/storage/SimpleStorageHelper.kt +++ b/storage/src/main/java/com/anggrayudi/storage/SimpleStorageHelper.kt @@ -13,6 +13,7 @@ import androidx.activity.ComponentActivity import androidx.appcompat.app.AlertDialog import androidx.documentfile.provider.DocumentFile import androidx.fragment.app.Fragment +import com.anggrayudi.storage.SimpleStorage.Companion.LIBRARY_PACKAGE_NAME import com.anggrayudi.storage.callback.CreateFileCallback import com.anggrayudi.storage.callback.FilePickerCallback import com.anggrayudi.storage.callback.FileReceiverCallback @@ -452,10 +453,10 @@ class SimpleStorageHelper { const val TYPE_FOLDER_PICKER = 2 private const val KEY_OPEN_FOLDER_PICKER_ONCE_GRANTED = - BuildConfig.LIBRARY_PACKAGE_NAME + ".pickerToOpenOnceGranted" + LIBRARY_PACKAGE_NAME + ".pickerToOpenOnceGranted" private const val KEY_ORIGINAL_REQUEST_CODE = - BuildConfig.LIBRARY_PACKAGE_NAME + ".originalRequestCode" - private const val KEY_FILTER_MIME_TYPES = BuildConfig.LIBRARY_PACKAGE_NAME + ".filterMimeTypes" + LIBRARY_PACKAGE_NAME + ".originalRequestCode" + private const val KEY_FILTER_MIME_TYPES = LIBRARY_PACKAGE_NAME + ".filterMimeTypes" @JvmStatic fun redirectToSystemSettings(context: Context) { diff --git a/storage/src/test/java/com/anggrayudi/storage/SimpleStorageTest.kt b/storage/src/test/java/com/anggrayudi/storage/SimpleStorageTest.kt index 633867c..28fde9d 100644 --- a/storage/src/test/java/com/anggrayudi/storage/SimpleStorageTest.kt +++ b/storage/src/test/java/com/anggrayudi/storage/SimpleStorageTest.kt @@ -5,6 +5,7 @@ import android.content.Context import android.content.UriPermission import android.net.Uri import android.os.Build +import com.anggrayudi.storage.SimpleStorage.Companion.LIBRARY_PACKAGE_NAME import io.mockk.* import java.io.File import kotlin.concurrent.thread @@ -25,7 +26,7 @@ class SimpleStorageTest { private val context = mockk { - val dataDirectoryPath = "/data/user/0/${BuildConfig.LIBRARY_PACKAGE_NAME}" + val dataDirectoryPath = "/data/user/0/${LIBRARY_PACKAGE_NAME}" val fileDir = File("$dataDirectoryPath/files") every { filesDir } returns fileDir every { dataDir } returns File(dataDirectoryPath) diff --git a/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt b/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt index 0168c5f..a1136d7 100644 --- a/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt +++ b/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt @@ -2,7 +2,7 @@ package com.anggrayudi.storage.file import android.content.Context import android.os.Environment -import com.anggrayudi.storage.BuildConfig +import com.anggrayudi.storage.SimpleStorage.Companion.LIBRARY_PACKAGE_NAME import com.anggrayudi.storage.file.StorageId.PRIMARY import io.mockk.every import io.mockk.mockk @@ -21,7 +21,7 @@ class DocumentFileCompatTest { private val context = mockk { - val dataDirectoryPath = "/data/user/0/${BuildConfig.LIBRARY_PACKAGE_NAME}" + val dataDirectoryPath = "/data/user/0/${LIBRARY_PACKAGE_NAME}" val fileDir = File("$dataDirectoryPath/files") every { filesDir } returns fileDir every { dataDir } returns File(dataDirectoryPath)