diff --git a/app/build.gradle b/app/build.gradle index 74be035..d94da32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "com.maxieds.ParklinkMCTLibraryDemo" minSdkVersion 25 targetSdkVersion 28 - versionCode 18 - versionName "1.1.8" + versionCode 19 + versionName "1.1.9" buildConfigField "String", "BUILD_TIMESTAMP", "\"" + getDateTimestamp() + "\"" buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\"" @@ -46,17 +46,32 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/license.txt' + exclude 'META-INF/NOTICE' + exclude 'META-INF/NOTICE.txt' + exclude 'META-INF/notice.txt' + exclude 'META-INF/ASL2.0' + exclude 'META-INF/androidx*' + exclude 'META-INF/android*' + } } } repositories { jcenter() + maven { url 'https://jitpack.io' } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:28.0.0' - implementation project(':MifareClassicToolLibrary') + //implementation project(':MifareClassicToolLibrary') + implementation 'com.github.maxieds:ParklinkMifareClassicToolLibrary:1.1.8' implementation 'com.nononsenseapps:filepicker:4.1.0' }