Merge pull request #25 from niscy-eudiw/main

Added LibraryExtension Config for feature convention plugin

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -15,15 +15,18 @@
  */
 
 import com.android.build.gradle.LibraryExtension
+import eu.europa.ec.euidi.config.LibraryPluginConfig
 import eu.europa.ec.euidi.configureGradleManagedDevices
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.dependencies
 
 class AndroidFeatureConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
+            val config = extensions.create<LibraryPluginConfig>("featureConfig", false)
             pluginManager.apply {
                 apply("eudi.android.library")
                 apply("eudi.android.library.compose")
@@ -45,6 +48,14 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 add("testImplementation", project(":test-feature"))
                 add("androidTestImplementation", project(":test-feature"))
             }
+
+            afterEvaluate {
+                if (!config.isCommonFeature) {
+                    dependencies {
+                        add("implementation", project(":common-feature"))
+                    }
+                }
+            }
         }
     }
 }

build-logic/convention/src/main/kotlin/eu/europa/ec/euidi/config/LibraryPluginConfig.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2023 European Commission
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work
+ * except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the Licence for the specific language
+ * governing permissions and limitations under the Licence.
+ */
+
+package eu.europa.ec.euidi.config
+
+open class LibraryPluginConfig(var isCommonFeature: Boolean)

common-feature/build.gradle.kts

@@ -24,4 +24,8 @@ android {
 
 dependencies {
     implementation(libs.gson)
+}
+
+featureConfig {
+    isCommonFeature = true
 }

dashboard-feature/build.gradle.kts

@@ -22,7 +22,6 @@ android {
 }
 
 dependencies {
-    implementation(project(":common-feature"))
     implementation(libs.zxing)
     implementation(libs.androidx.camera.core)
     implementation(libs.androidx.camera.lifecycle)

issuance-feature/build.gradle.kts

@@ -19,8 +19,4 @@ plugins {
 
 android {
     namespace = "eu.europa.ec.issuancefeature"
-}
-
-dependencies {
-    implementation(project(":common-feature"))
 }

login-feature/build.gradle.kts

@@ -21,7 +21,3 @@ plugins {
 android {
     namespace = "eu.europa.ec.loginfeature"
 }
-
-dependencies {
-    implementation(project(":common-feature"))
-}

presentation-feature/build.gradle.kts

@@ -19,8 +19,4 @@ plugins {
 
 android {
     namespace = "eu.europa.ec.presentationfeature"
-}
-
-dependencies {
-    implementation(project(":common-feature"))
 }

proximity-feature/build.gradle.kts

@@ -22,6 +22,5 @@ android {
 }
 
 dependencies {
-    implementation(project(":common-feature"))
     implementation(libs.zxing)
 }

startup-feature/build.gradle.kts

@@ -20,8 +20,4 @@ plugins {
 
 android {
     namespace = "eu.europa.ec.startupfeature"
-}
-
-dependencies {
-    implementation(project(":common-feature"))
 }