diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle index ab7a66b5..3475d95b 100644 --- a/android-sdk/build.gradle +++ b/android-sdk/build.gradle @@ -71,19 +71,19 @@ android { } - packagingOptions { - exclude("META-INF/DEPENDENCIES") - exclude("META-INF/LICENSE") - exclude("META-INF/LICENSE.txt") - exclude("META-INF/LICENSE.md") - exclude("META-INF/LICENSE-notice.md") - 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/*.kotlin_module") - } +// packagingOptions { +// exclude("META-INF/DEPENDENCIES") +// exclude("META-INF/LICENSE") +// exclude("META-INF/LICENSE.txt") +// exclude("META-INF/LICENSE.md") +// exclude("META-INF/LICENSE-notice.md") +// 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/*.kotlin_module") +// } } dependencies { diff --git a/android-sdk/gradle.properties b/android-sdk/gradle.properties index 72eca525..b27b8c03 100644 --- a/android-sdk/gradle.properties +++ b/android-sdk/gradle.properties @@ -23,7 +23,7 @@ # # LIBRARY_VERSION=5.1.4.3 (hotfixes are included on this variable) # -LIBRARY_VERSION=5.1.7 +LIBRARY_VERSION=5.1.7.1 BINTRAY_REPO=webtrekk-android-sdk BINRTAY_NAME=webtrekk-android-sdk PUBLISHED_GROUP_ID=com.mapp.sdk diff --git a/sample/build.gradle b/sample/build.gradle index 86d8aa39..e9c549b0 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -106,7 +106,7 @@ android { } dependencies { - implementation 'androidx.recyclerview:recyclerview:1.3.2' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation('com.google.android.material:material:1.9.0') implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlinVersion" @@ -124,8 +124,8 @@ dependencies { implementation('com.mapp.sdk:mapp-android:6.0.20.1') - implementation(project(':android-sdk')) - //implementation ("com.mapp.sdk:intelligence-android:5.1.6.1") + //implementation(project(':android-sdk')) + implementation ("com.mapp.sdk:intelligence-android:5.1.7.1") //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' diff --git a/sample/src/main/java/com/example/webtrekk/androidsdk/CampaignActivity.kt b/sample/src/main/java/com/example/webtrekk/androidsdk/CampaignActivity.kt index 0eb61da5..3767aa58 100644 --- a/sample/src/main/java/com/example/webtrekk/androidsdk/CampaignActivity.kt +++ b/sample/src/main/java/com/example/webtrekk/androidsdk/CampaignActivity.kt @@ -14,7 +14,7 @@ class CampaignActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_campaign); + setContentView(R.layout.activity_campaign) button1.setOnClickListener {