ADFA-2783: update templates to use compile/target SDK 36

common/src/main/java/com/itsaky/androidide/utils/Environment.java

@@ -28,6 +28,7 @@
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.adfa.constants.ConstantsKt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +40,7 @@ public final class Environment {
 	public static final String DEFAULT_HOME = DEFAULT_ROOT + "/home";
 	private static final String DEFAULT_ANDROID_HOME = DEFAULT_HOME + "/android-sdk";
 	public static final String GRADLE_CACHE_DIR = DEFAULT_HOME + "/.gradle";
-	private static final String ANDROID_JAR_HOME = DEFAULT_ANDROID_HOME + "/platforms/android-33";
+	private static final String ANDROID_JAR_HOME = DEFAULT_ANDROID_HOME + "/platforms/android-" + ConstantsKt.getCOMPILE_SDK_VERSION().getApi();
 	public static final String DEFAULT_PREFIX = DEFAULT_ROOT + "/usr";
 	public static final String DEFAULT_JAVA_HOME = DEFAULT_PREFIX + "/lib/jvm/java-21-openjdk";
 	private static final String ANDROIDIDE_PROJECT_CACHE_DIR = SharedEnvironment.PROJECT_CACHE_DIR_NAME;

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

@@ -26,32 +26,38 @@ package org.adfa.constants
  * * Moved from template-api in case of a roor repo merge we have to manuall move changes here.
  */
 
-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),
-    Nougat("Nougat", "7.0", 24),
-    NougatMR1("Nougat", "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("Snow Cone", "12", 31),
-    SnowConeV2("Snow Cone", "12L", 32),
-    Tiramisu("Tiramisu", "13", 33),
-    UpsideDownCake("Upside Down Cake", "14", 34),
-    VanillaIceCream("Vanilla Ice Cream", "15", 35);
+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),
+	Nougat("Nougat", "7.0", 24),
+	NougatMR1("Nougat", "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("Snow Cone", "12", 31),
+	SnowConeV2("Snow Cone", "12L", 32),
+	Tiramisu("Tiramisu", "13", 33),
+	UpsideDownCake("Upside Down Cake", "14", 34),
+	VanillaIceCream("Vanilla Ice Cream", "15", 35),
+	Baklava("Baklava", "16", 36),
+	;
 
-    /**
-     * 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)"
+}

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

@@ -21,9 +21,9 @@ const val ANDROID_GRADLE_PLUGIN_VERSION = "8.11.0"
 const val GRADLE_DISTRIBUTION_VERSION = "8.14.3"
 const val KOTLIN_VERSION = "1.9.22"
 
-val TARGET_SDK_VERSION = Sdk.Tiramisu
-val COMPILE_SDK_VERSION = Sdk.Tiramisu
-val COMPOSE_SDK_VERSION = Sdk.Tiramisu
+val TARGET_SDK_VERSION = Sdk.Baklava
+val COMPILE_SDK_VERSION = Sdk.Baklava
+val COMPOSE_SDK_VERSION = Sdk.Baklava
 
 const val JAVA_SOURCE_VERSION = "17"
 const val JAVA_TARGET_VERSION = "17"