Update plugin to support libraries and add example lib module

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build Example
 on: [ push, workflow_dispatch ]
 
 jobs:
-  build:
+  build_app:
     runs-on: ubuntu-latest
     steps:
       # Checkout repository
@@ -20,3 +20,21 @@ jobs:
       # Run the Gradle Build task
       - name: Build Example App
         run: ./gradlew clean :appexample:assemble
+
+  build_lib:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout repository
+      - name: Checkout
+        uses: actions/[email protected]
+
+      # Setup JDK environment
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      # Run the Gradle Build task
+      - name: Build Example Lib
+        run: ./gradlew clean :libexample:assemble

appexample/build.gradle.kts

@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	alias(libs.plugins.androidApplication)
-	alias(libs.plugins.kotlinAndroid)
+	alias(libs.plugins.android.application)
+	alias(libs.plugins.kotlin.android)
 	id("ch.ubique.gradle.preset")
 }
 

build.gradle.kts

@@ -1,7 +1,8 @@
 plugins {
     alias(libs.plugins.kotlin) apply false
-    alias(libs.plugins.androidApplication) apply false
-    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
 }
 
 tasks.register("clean", Delete::class.java) {

gradle/libs.versions.toml

@@ -9,9 +9,10 @@ androidx-lifecycle = "2.8.6"
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish"}
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
 vanniktech = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech" }
 
 [libraries]

libexample/.gitignore

@@ -0,0 +1 @@
+/build

libexample/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    id("ch.ubique.gradle.preset")
+}
+
+android {
+    namespace = "ch.ubique.preset.example"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+        targetSdk = 34
+
+        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.lifecycle.viewmodelKtx)
+}

libexample/src/main/kotlin/ch/ubique/preset/example/ExampleLibrary.kt

@@ -0,0 +1,5 @@
+package ch.ubique.preset.example
+
+object ExampleLibrary {
+
+}

preset/plugin/src/main/kotlin/ch/ubique/gradle/preset/PresetPlugin.kt

@@ -1,8 +1,10 @@
 package ch.ubique.gradle.preset
 
 import ch.ubique.gradle.preset.config.PresetPluginConfig
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.AndroidComponentsExtension
-import com.android.build.gradle.AppExtension
+import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.ProguardFiles.getDefaultProguardFile
 import org.gradle.api.GradleException
 import org.gradle.api.JavaVersion
@@ -19,39 +21,12 @@ abstract class PresetPlugin : Plugin<Project> {
 		val androidExtension = getAndroidExtension(project)
 		val androidComponentExtension = getAndroidComponentsExtension(project)
 
+		// Apply presets specific to applications
+		(androidExtension as? ApplicationExtension)?.applyAppPreset(project)
+
 		// Enable BuildConfig
 		androidExtension.buildFeatures.buildConfig = true
 
-		// Default dimension
-		androidExtension.flavorDimensions("default")
-
-		// Add flavor boolean fields to BuildConfig
-		androidExtension.productFlavors.configureEach { flavor ->
-			val sanitizedFlavorName = flavor.name.replace("[^a-zA-Z0-9_]", "_")
-
-			// default flavor dimension
-			flavor.dimension = "default"
-
-			// default application id suffix
-			flavor.applicationIdSuffix = when (flavor.name) {
-				"prod", "production" -> null
-				else -> ".$sanitizedFlavorName"
-			}
-
-			// flavor BuildConfig flag
-			val flavorFieldName = "IS_FLAVOR_${sanitizedFlavorName.uppercase()}"
-			// true for this flavor ...
-			flavor.buildConfigField("boolean", flavorFieldName, "true")
-			// ... false for all others
-			androidExtension.defaultConfig.buildConfigField("boolean", flavorFieldName, "false")
-		}
-
-		// Release build config
-		androidExtension.buildTypes.maybeCreate("release").apply {
-			isMinifyEnabled = true
-			proguardFiles(getDefaultProguardFile("proguard-android.txt", project.layout.buildDirectory), "proguard-rules.pro")
-		}
-
 		// R8 full mode check
 		if (project.findProperty("android.enableR8.fullMode") != "false" && project.findProperty("android.enableR8.fullModeAllowed") != "true") {
 			throw IllegalArgumentException("R8 full mode is enabled. Disable it with android.enableR8.fullMode=false or allow it by setting android.enableR8.fullModeAllowed=true")
@@ -81,9 +56,10 @@ abstract class PresetPlugin : Plugin<Project> {
 		androidExtension.lintOptions.isAbortOnError = false
 	}
 
-	private fun getAndroidExtension(project: Project): AppExtension {
-		val ext = project.extensions.findByType(AppExtension::class.java)
-			?: throw GradleException("Android gradle plugin extension has not been applied before")
+	private fun getAndroidExtension(project: Project): BaseExtension {
+		val ext = project.extensions.findByType(BaseExtension::class.java)
+			?.takeIf { it is ApplicationExtension || it is LibraryExtension }
+			?: throw GradleException("Android gradle plugin (application or library) extension has not been applied before")
 		return ext
 	}
 
@@ -93,4 +69,36 @@ abstract class PresetPlugin : Plugin<Project> {
 		return ext
 	}
 
+	private fun ApplicationExtension.applyAppPreset(project: Project) {
+		// Default dimension
+		flavorDimensions += "default"
+
+		// Add flavor boolean fields to BuildConfig
+		productFlavors.configureEach { flavor ->
+			val sanitizedFlavorName = flavor.name.replace("[^a-zA-Z0-9_]", "_")
+
+			// default flavor dimension
+			flavor.dimension = "default"
+
+			// default application id suffix
+			flavor.applicationIdSuffix = when (flavor.name) {
+				"prod", "production" -> null
+				else -> ".$sanitizedFlavorName"
+			}
+
+			// flavor BuildConfig flag
+			val flavorFieldName = "IS_FLAVOR_${sanitizedFlavorName.uppercase()}"
+			// true for this flavor ...
+			flavor.buildConfigField("boolean", flavorFieldName, "true")
+			// ... false for all others
+			defaultConfig.buildConfigField("boolean", flavorFieldName, "false")
+		}
+
+		// Release build config
+		buildTypes.maybeCreate("release").apply {
+			isMinifyEnabled = true
+			proguardFiles(getDefaultProguardFile("proguard-android.txt", project.layout.buildDirectory), "proguard-rules.pro")
+		}
+	}
+
 }

settings.gradle.kts

@@ -19,4 +19,5 @@ dependencyResolutionManagement {
 rootProject.name = "gradle-plugin-preset-android"
 
 include("appexample")
+include("libexample")
 includeBuild("preset")