Fix #2: Updated gradle and removed unwanted files

decentralised-dataexchange · Mar 27, 2024 · a06d660 · a06d660
1 parent b4e25d2
commit a06d660
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 134 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -36,17 +36,6 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
 
     buildFeatures {
         dataBinding = true
@@ -84,4 +73,9 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
 
     implementation("com.github.decentralised-dataexchange:presentation-exchange-sdk-android:2024.3.1")
+    implementation("org.slf4j:slf4j-api") {
+        version {
+            strictly("2.0.9")
+        }
+    }
 }
diff --git a/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Color.kt b/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Color.kt
diff --git a/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Theme.kt b/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Theme.kt
diff --git a/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Type.kt b/app/src/main/java/com/ewc/eudiwalletoidcandroid/ui/theme/Type.kt
diff --git a/eudi-wallet-oidc-android/build.gradle.kts b/eudi-wallet-oidc-android/build.gradle.kts
@@ -57,17 +57,27 @@ dependencies {
     implementation("com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2")
 
     implementation("com.github.decentralised-dataexchange:presentation-exchange-sdk-android:2024.3.1")
+    implementation("org.slf4j:slf4j-api") {
+        version {
+            strictly("2.0.9")
+        }
+    }
 
     implementation("com.google.crypto.tink:tink-android:1.7.0")
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("Maven") {
-            groupId = "com.github.decentraliseddataexchange"
-            artifactId = "eudi-wallet-oidc-android"
-            version = "2024.3.1"
-            artifact("$buildDir/outputs/aar/eudi-wallet-oidc-android-release.aar")
+afterEvaluate {
+    publishing {
+        publications {
+            register<MavenPublication>("release") {
+                groupId = "com.github.decentraliseddataexchange"
+                artifactId = "eudi-wallet-oidc-android"
+                version = "2024.3.1"
+
+                afterEvaluate {
+                    from(components["release"])
+                }
+            }
         }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,6 +24,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Eudi Wallet OIDC Android"
+rootProject.name = "eudi-wallet-oidc-android"
 include(":app")
 include(":eudi-wallet-oidc-android")