diff options
author | Florian Dold <florian@dold.me> | 2022-05-16 16:26:36 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-05-16 16:26:36 +0200 |
commit | 22e5e8034d2891f04568e724baa8b5c95660b897 (patch) | |
tree | ea8c756f38958609e54e6c45deff508b9df15615 /taler-kotlin-android | |
parent | d32573aad045c76c6ae75269eaa6591ce6fb4ae9 (diff) | |
download | taler-android-22e5e8034d2891f04568e724baa8b5c95660b897.tar.gz taler-android-22e5e8034d2891f04568e724baa8b5c95660b897.tar.bz2 taler-android-22e5e8034d2891f04568e724baa8b5c95660b897.zip |
-upgrade gradle
Diffstat (limited to 'taler-kotlin-android')
-rw-r--r-- | taler-kotlin-android/build.gradle | 9 | ||||
-rw-r--r-- | taler-kotlin-android/src/main/AndroidManifest.xml | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle index 4661b09..e45a3a1 100644 --- a/taler-kotlin-android/build.gradle +++ b/taler-kotlin-android/build.gradle @@ -28,8 +28,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 30 - versionCode 1 - versionName "0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -49,11 +47,14 @@ android { buildFeatures { viewBinding = true } - packagingOptions { - exclude("META-INF/*.kotlin_module") + resources { + excludes += ['META-INF/*.kotlin_module'] + } } + namespace 'net.taler.common' + } dependencies { diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml b/taler-kotlin-android/src/main/AndroidManifest.xml index f74aae6..c1f6146 100644 --- a/taler-kotlin-android/src/main/AndroidManifest.xml +++ b/taler-kotlin-android/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="net.taler.common"> + xmlns:tools="http://schemas.android.com/tools"> <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" /> |