diff --git a/app/build.gradle b/app/build.gradle index 8c375646..d61dd4ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -126,7 +126,9 @@ dependencies { implementation libraries.appMetrica implementation libraries.branch - implementation libraries.facebookSdk + implementation(libraries.facebookSdk) { + exclude group: 'com.android.support' + } implementation libraries.vkSdk implementation libraries.glide diff --git a/app/src/main/java/org/stepik/android/adaptive/App.kt b/app/src/main/java/org/stepik/android/adaptive/App.kt index 1d494058..3e42ce30 100644 --- a/app/src/main/java/org/stepik/android/adaptive/App.kt +++ b/app/src/main/java/org/stepik/android/adaptive/App.kt @@ -1,7 +1,6 @@ package org.stepik.android.adaptive import android.app.Application -import com.facebook.FacebookSdk import com.vk.sdk.VKSdk import com.yandex.metrica.YandexMetrica import com.yandex.metrica.YandexMetricaConfig @@ -59,7 +58,6 @@ class App : Application() { private fun initServices() { VKSdk.initialize(applicationContext) - FacebookSdk.sdkInitialize(applicationContext) YandexMetrica.activate(applicationContext, YandexMetricaConfig.newConfigBuilder(config.appMetricaKey).build()) YandexMetrica.enableActivityAutoTracking(this) diff --git a/app/src/toefl3150/res/values/strings.xml b/app/src/toefl3150/res/values/strings.xml index 81193293..73b7645d 100644 --- a/app/src/toefl3150/res/values/strings.xml +++ b/app/src/toefl3150/res/values/strings.xml @@ -11,4 +11,5 @@

Welcome to adaptive TOEFL Vocabulary course. During this course you\'ll receive tasks depending on your answers and reactions. Let\'s look how is it work.

]]> Words: %d]]> + 366155483947215 \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 358f520b..1925e496 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ ext.versions = [ - code : 23, - name : '1.14', + code : 24, + name : '1.15', minSdk : 17, targetSdk : 26, @@ -38,7 +38,7 @@ ext.versions = [ appMetrica : '3.2.2', branch : '2.+', - facebook : '4.17.0', + facebook : '4.39.0', vk : '1.6.5', glide : '3.7.0',