diff --git a/build.gradle.kts b/build.gradle.kts index 3d8a023..f808b37 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,4 +11,8 @@ buildscript { plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false -} \ No newline at end of file +} + +subprojects { + group = "ee.ria.DigiDoc" +} diff --git a/libs/id-card-lib/build.gradle.kts b/libs/id-card-lib/build.gradle.kts index 92cf980..1538780 100644 --- a/libs/id-card-lib/build.gradle.kts +++ b/libs/id-card-lib/build.gradle.kts @@ -28,9 +28,10 @@ dependencies { implementation(libs.bcprov.jdk18on) implementation(project(":libs:smart-card-reader-lib")) - implementation(project(":libs:card-utils-lib")) + // Provided at runtime by the consuming app (RIA DigiDoc utils-lib) + compileOnly(project(":libs:card-utils-lib")) testImplementation(libs.junit) testImplementation(libs.mockito.core) testImplementation(libs.truth) -} +} \ No newline at end of file diff --git a/libs/smart-card-reader-lib/build.gradle.kts b/libs/smart-card-reader-lib/build.gradle.kts index f64bb05..352bd03 100644 --- a/libs/smart-card-reader-lib/build.gradle.kts +++ b/libs/smart-card-reader-lib/build.gradle.kts @@ -29,7 +29,8 @@ dependencies { implementation(libs.androidx.annotation) implementation(libs.bcprov.jdk18on) - implementation(project(":libs:card-utils-lib")) + // Provided at runtime by the consuming app (RIA DigiDoc utils-lib) + compileOnly(project(":libs:card-utils-lib")) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) diff --git a/settings.gradle.kts b/settings.gradle.kts index f467ac9..82e3179 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,9 +24,13 @@ dependencyResolutionManagement { rootProject.name = "NFC-Android library and demo app" -include(":demoapp") -include(":demoapp:app") -include(":demoapp:libdigidocpp") +// Demo app is only needed when building this repository directly, not when +// the libraries are consumed as a Gradle source dependency +if (gradle.parent == null) { + include(":demoapp") + include(":demoapp:app") + include(":demoapp:libdigidocpp") +} include(":libs") include(":libs:card-utils-lib") include(":libs:id-card-lib")