ADFA-778: move :constants to :composite-builds:build-deps-common:constants`

app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt

@@ -20,22 +20,21 @@ package com.itsaky.androidide.activities
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.ActivityInfo
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import com.adfa.constants.ANDROID_SDK_ZIP
-import com.adfa.constants.DESTINATION_ANDROID_SDK
-import com.adfa.constants.HOME_PATH
-import com.adfa.constants.LOCAL_MAVEN_CACHES_DEST
-import com.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
-import com.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
-import com.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
-import com.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
-import com.adfa.constants.MANIFEST_FILE_NAME
-import com.adfa.constants.TERMUX_DEBS_PATH
+import org.adfa.constants.ANDROID_SDK_ZIP
+import org.adfa.constants.DESTINATION_ANDROID_SDK
+import org.adfa.constants.HOME_PATH
+import org.adfa.constants.LOCAL_MAVEN_CACHES_DEST
+import org.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
+import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
+import org.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
+import org.adfa.constants.MANIFEST_FILE_NAME
+import org.adfa.constants.TERMUX_DEBS_PATH
 import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.github.appintro.AppIntro2

app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt

@@ -30,7 +30,7 @@ import androidx.appcompat.view.menu.MenuBuilder
 import androidx.collection.MutableIntObjectMap
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.blankj.utilcode.util.ImageUtils
 import com.itsaky.androidide.R.string
 import com.itsaky.androidide.actions.ActionData
@@ -56,7 +56,6 @@ import com.itsaky.androidide.models.OpenedFilesCache
 import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.models.SaveResult
 import com.itsaky.androidide.projects.ProjectManagerImpl
-import com.itsaky.androidide.roomData.tooltips.Tooltip
 import com.itsaky.androidide.tasks.executeAsync
 import com.itsaky.androidide.ui.CodeEditorView
 import com.itsaky.androidide.utils.DialogUtils.newYesNoDialog

app/src/main/java/com/itsaky/androidide/activities/editor/FAQActivity.kt

@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebViewClient
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.itsaky.androidide.R
 import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityFaqBinding

app/src/main/java/com/itsaky/androidide/activities/editor/HelpActivity.kt

@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebViewClient
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.itsaky.androidide.R
 import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityHelpBinding

app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt

@@ -25,8 +25,8 @@ import android.widget.CheckBox
 import androidx.activity.viewModels
 import androidx.annotation.GravityInt
 import androidx.appcompat.app.AlertDialog
-import com.adfa.constants.CONTENT_KEY
-import com.adfa.constants.HELP_PAGE_URL
+import org.adfa.constants.CONTENT_KEY
+import org.adfa.constants.HELP_PAGE_URL
 import com.blankj.utilcode.util.SizeUtils
 import com.blankj.utilcode.util.ThreadUtils
 import com.itsaky.androidide.R

app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt

@@ -2,7 +2,6 @@ package com.itsaky.androidide.fragments
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,7 +12,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.viewModels
-import com.adfa.constants.FEEDBACK_EMAIL
+import org.adfa.constants.FEEDBACK_EMAIL
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.itsaky.androidide.R
 import com.itsaky.androidide.activities.MainActivity
@@ -22,7 +21,6 @@ import com.itsaky.androidide.activities.TerminalActivity
 import com.itsaky.androidide.adapters.MainActionsListAdapter
 import com.itsaky.androidide.app.BaseApplication
 import com.itsaky.androidide.app.BaseIDEActivity
-import com.itsaky.androidide.buildinfo.BuildInfo
 import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
 import com.itsaky.androidide.databinding.FragmentMainBinding
 import com.itsaky.androidide.idetooltips.IDETooltipDatabase

app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt

@@ -38,9 +38,9 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.core.content.getSystemService
 import androidx.core.view.isVisible
-import com.adfa.constants.ARM_KEY
-import com.adfa.constants.V7_KEY
-import com.adfa.constants.V8_KEY
+import org.adfa.constants.ARM_KEY
+import org.adfa.constants.V7_KEY
+import org.adfa.constants.V8_KEY
 import com.github.appintro.SlidePolicy
 import com.itsaky.androidide.R
 import com.itsaky.androidide.databinding.LayoutOnboardngSetupConfigBinding

app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt

@@ -25,8 +25,8 @@ import android.content.Intent
 import android.os.IBinder
 import android.text.TextUtils
 import androidx.core.app.NotificationManagerCompat
-import com.adfa.constants.GRADLE_FOLDER_NAME
-import com.adfa.constants.TOML_FILE_NAME
+import org.adfa.constants.GRADLE_FOLDER_NAME
+import org.adfa.constants.TOML_FILE_NAME
 import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.itsaky.androidide.BuildConfig
@@ -374,7 +374,7 @@ class GradleBuildService : Service(), BuildService, IToolingApiClient,
          * we will add more than 1 supported gradle versions.
          */
         val propertiesFile = files.first { it.name.contains("properties") }
-        val path = File(projectDir.absolutePath + File.separator +GRADLE_FOLDER_NAME +File.separator + TOML_FILE_NAME)
+        val path = File(projectDir.absolutePath + File.separator + GRADLE_FOLDER_NAME +File.separator + TOML_FILE_NAME)
         val isTomlProject = path.exists()
         println("hz path $path")
         println("hz build $isTomlProject")

app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt

@@ -17,11 +17,8 @@
 
 package com.itsaky.androidide.utils
 
-import com.adfa.constants.GRADLE_WRAPPER_PART_FILE_NAME
-import com.adfa.constants.GRADLE_ZIP_FILE_NAME
-import com.adfa.constants.LOCAL_AGP_8_0_0_CACHES_DEST
-import com.adfa.constants.LOCAL_MAVEN_CACHES_DEST
-import com.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.LOCAL_MAVEN_CACHES_DEST
+import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
 import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.itsaky.androidide.app.IDEApplication

common/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     api(libs.common.editor)
     api(libs.common.lang3)
     api(libs.common.utilcode)
+    api(libs.composite.constants)
     api(libs.google.guava)
     api(libs.google.material)
 
@@ -36,7 +37,6 @@ dependencies {
     api(projects.logger)
     api(projects.resources)
     api(projects.subprojects.flashbar)
-    api(projects.constants)
     implementation(libs.monitor)
 
     testImplementation(libs.tests.junit)

composite-builds/build-deps-common/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("java")
+    kotlin("jvm") version "1.9.22"
+}
+
+allprojects {
+    plugins.withId("java-library") {
+        java {
+            toolchain {
+                languageVersion = JavaLanguageVersion.of(17)
+            }
+        }
+    }
+
+    plugins.withId("org.jetbrains.kotlin.jvm") {
+        kotlin {
+            jvmToolchain(17)
+        }
+    }
+}

composite-builds/build-deps-common/constants/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    //noinspection JavaPluginLanguageLevel
+    id("java-library")
+    alias(libs.plugins.kotlin.jvm)
+}

constants/src/main/java/com/adfa/constants/Sdk.kt → composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/Sdk.kt

@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.adfa.constants
+package org.adfa.constants
 
 /**
  * Android API versions.
@@ -27,31 +27,31 @@ package com.adfa.constants
  */
 
 enum class Sdk(val codename: String, val version: String, val api: Int) {
-  JellyBean("Jelly Bean", "4.1", 16),
-  JellyBeanMR1("Jelly Bean", "4.2", 17),
-  JellyBeanMR2("Jelly Bean", "4.3", 18),
-  KitKat("KitKat", "4.4", 19),
-  KitKatWatch("KitKat Watch", "4.4W", 20),
-  Lollipop("Lollipop", "5.0", 21),
-  LollipopMR1("Lollipop", "5.1", 22),
-  Marshmallow("Marshmallow", "6.0", 23),
-  Naughat("Naughat", "7.0", 24),
-  NaughtMR1("Naughat", "7.1", 25),
-  Oreo("Oreo", "8.0", 26),
-  OreoMR1("Oreo", "8.1", 27),
-  Pie("Pie", "9.0", 28),
-  QuinceTart("Q", "10", 29),
-  RedVelvetCake("R", "11", 30),
-  SnowCone("SnowCone", "12", 31),
-  SnowCodeV2("SnowCone", "12L", 32),
-  Tiramisu("Tiramisu", "13", 33),
-  UpsideDownCake("UpsideDownCake", "14", 34),
-  VanollaIceCream("VanollaIceCream", "15", 35);
+    JellyBean("Jelly Bean", "4.1", 16),
+    JellyBeanMR1("Jelly Bean", "4.2", 17),
+    JellyBeanMR2("Jelly Bean", "4.3", 18),
+    KitKat("KitKat", "4.4", 19),
+    KitKatWatch("KitKat Watch", "4.4W", 20),
+    Lollipop("Lollipop", "5.0", 21),
+    LollipopMR1("Lollipop", "5.1", 22),
+    Marshmallow("Marshmallow", "6.0", 23),
+    Naughat("Naughat", "7.0", 24),
+    NaughtMR1("Naughat", "7.1", 25),
+    Oreo("Oreo", "8.0", 26),
+    OreoMR1("Oreo", "8.1", 27),
+    Pie("Pie", "9.0", 28),
+    QuinceTart("Q", "10", 29),
+    RedVelvetCake("R", "11", 30),
+    SnowCone("SnowCone", "12", 31),
+    SnowCodeV2("SnowCone", "12L", 32),
+    Tiramisu("Tiramisu", "13", 33),
+    UpsideDownCake("UpsideDownCake", "14", 34),
+    VanollaIceCream("VanollaIceCream", "15", 35);
 
-  /**
-   * Get the display name for this Sdk version.
-   *
-   * @return The display name.
-   */
-  fun displayName() : String = "API ${api}: Android $version (${codename})"
+    /**
+     * Get the display name for this Sdk version.
+     *
+     * @return The display name.
+     */
+    fun displayName() : String = "API ${api}: Android $version (${codename})"
 }

constants/src/main/java/com/adfa/constants/constants.kt → composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt

@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.adfa.constants
+package org.adfa.constants
 
 import java.io.File
 
@@ -55,10 +55,10 @@ const val APG_SOURCE_FOLDER_NAME = "android_gradle_plugin"
 // used to be 8.0 before unification
 const val LOCAL_GRADLE_DISTRIBUTION_VERSION = "8.7"
 const val LOCAL_COMPOSE_GRADLE_DISTRIBUTION_VERSION = "8.7"
-const val GRADLE_VERSION = "gradle-${LOCAL_GRADLE_DISTRIBUTION_VERSION}"
-const val COMPOSE_GRADLE_VERSION = "gradle-${LOCAL_COMPOSE_GRADLE_DISTRIBUTION_VERSION}"
-const val GRADLE_WRAPPER_FILE_NAME = "${GRADLE_VERSION}-bin.zip"
-const val COMPOSE_GRADLE_WRAPPER_FILE_NAME = "${COMPOSE_GRADLE_VERSION}-bin.zip"
+const val GRADLE_VERSION = "gradle-$LOCAL_GRADLE_DISTRIBUTION_VERSION"
+const val COMPOSE_GRADLE_VERSION = "gradle-$LOCAL_COMPOSE_GRADLE_DISTRIBUTION_VERSION"
+const val GRADLE_WRAPPER_FILE_NAME = "$GRADLE_VERSION-bin.zip"
+const val COMPOSE_GRADLE_WRAPPER_FILE_NAME = "$COMPOSE_GRADLE_VERSION-bin.zip"
 val GRADLE_WRAPPER_PATH_SUFFIX = GRADLE_FOLDER_NAME + File.separator + "wrapper" + File.separator
 
 // AGP
@@ -68,32 +68,33 @@ const val DEST_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION = "8.0.0"
 const val KOTLIN_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION = "1.8.0"
 
 const val LOCAL_SOURCE_ANDROID_GRADLE_PLUGIN_VERSION_NAME =
-    "gradle-${LOCAL_ANDROID_GRADLE_PLUGIN_VERSION}.jar"
+    "gradle-$LOCAL_ANDROID_GRADLE_PLUGIN_VERSION.jar"
 const val LOCAL_SOURCE_ANDROID_KOTLIN_GRADLE_PLUGIN_VERSION_NAME =
-    "kotlin-gradle-plugin-${KOTLIN_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION}.jar"
+    "kotlin-gradle-plugin-$KOTLIN_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION.jar"
 
 const val LOCAL_ANDROID_GRADLE_PLUGIN_NAME =
-    "gradle-${DEST_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION}"
-const val LOCAL_ANDROID_GRADLE_PLUGIN_JAR_NAME = "${LOCAL_ANDROID_GRADLE_PLUGIN_NAME}.jar"
+    "gradle-$DEST_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION"
+const val LOCAL_ANDROID_GRADLE_PLUGIN_JAR_NAME = "$LOCAL_ANDROID_GRADLE_PLUGIN_NAME.jar"
 const val ANDROID_KOTLIN_GRADLE_PLUGIN_VERSION_NAME =
-    "kotlin-gradle-plugin-${KOTLIN_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION}.jar"
+    "kotlin-gradle-plugin-$KOTLIN_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION.jar"
 
 /**
  * this line differes from LOCAL_ANDROID_GRADLE_PLUGIN_NAME by the : that we can use outside of gradle files.
  */
 const val LOCAL_ANDROID_GRADLE_PLUGIN_DEPENDENCY_NAME =
-    "com.android.tools.build:gradle:${DEST_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION}"
+    "com.android.tools.build:gradle:$DEST_LOCAL_ANDROID_GRADLE_PLUGIN_VERSION"
 
 // .androide folder
-const val ANDROIDIDE_PATH = "/data/data/com.itsaky.androidide/files/home/.androidide"
+@Suppress("SdCardPath")
+const val ANDROIDIDE_HOME = "/data/data/com.itsaky.androidide/files/home/.androidide"
 
 // Cogo gradle plugin
 const val COGO_GRADLE_PLUGIN_NAME = "cogo-plugin"
-const val COGO_GRADLE_PLUGIN_JAR_NAME = "${COGO_GRADLE_PLUGIN_NAME}.jar"
-const val COGO_GRADLE_PLUGIN_PATH = "${ANDROIDIDE_PATH}/plugin"
+const val COGO_GRADLE_PLUGIN_JAR_NAME = "$COGO_GRADLE_PLUGIN_NAME.jar"
+const val COGO_GRADLE_PLUGIN_PATH = "$ANDROIDIDE_HOME/plugin"
 
 // dists folder for gradle-<version>-bin.zip files
-const val GRADLE_DISTS = "${ANDROIDIDE_PATH}/gradle-dists"
+const val GRADLE_DISTS = "$ANDROIDIDE_HOME/gradle-dists"
 
 
 //ABI
@@ -129,11 +130,11 @@ const val LOCAL_MAVEN_REPO_FOLDER_DEST = "localMvnRepository"
 
 // SDK
 const val LOCAL_SOURCE_ANDROID_SDK = "androidsdk"
-const val DESTINATION_ANDROID_SDK = "${HOME_PATH}/${ANDROID_SDK_PATH}"
+const val DESTINATION_ANDROID_SDK = "$HOME_PATH/$ANDROID_SDK_PATH"
 
 // Platform Tools
 const val LOCAL_PLATFORM_TOOLS = "platformtools"
-const val DESTINATION_PLATFORM_TOOLS = "${HOME_PATH}/${ANDROID_SDK_PATH}/platform-tools"
+const val DESTINATION_PLATFORM_TOOLS = "$HOME_PATH/$ANDROID_SDK_PATH/platform-tools"
 
 // New tasks
 const val COPY_GRADLE_EXECUTABLE_TASK_NAME = "copyGradleExecutable"

composite-builds/build-deps-common/desugaring-core/build.gradle.kts

@@ -16,10 +16,6 @@
  */
 
 plugins {
+  //noinspection JavaPluginLanguageLevel
   id("java-library")
 }
-
-java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
-}

composite-builds/build-deps-common/settings.gradle.kts

@@ -40,6 +40,7 @@ dependencyResolutionManagement {
 }
 
 include(
+  ":constants",
   ":desugaring-core",
 )
 

composite-builds/build-logic/build.gradle.kts

@@ -19,15 +19,19 @@ plugins {
     id("java")
     kotlin("jvm") version "1.9.22"
 }
-subprojects {
+
+allprojects {
     plugins.withId("java-library") {
-        extensions.getByType(JavaPluginExtension::class.java).apply {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
+        java {
+            toolchain {
+                languageVersion = JavaLanguageVersion.of(17)
+            }
+        }
+    }
+
+    plugins.withId("org.jetbrains.kotlin.jvm") {
+        kotlin {
+            jvmToolchain(17)
         }
     }
-}
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }