Merge branch 'release/1.15'

StepicOrg · Dec 14, 2018 · f6bb8e6 · f6bb8e6
2 parents a7d10e4 + 2f257b8
commit f6bb8e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -11,4 +11,5 @@
         <p>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.</p>
     ]]></string>
     <string name="questions_count"><![CDATA[<b>Words:</b> %d]]></string>
+    <string name="facebook_app_id" translatable="false">366155483947215</string>
 </resources>
diff --git 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',