diff --git a/apps/parent/build.gradle b/apps/parent/build.gradle index f2c781266f..b70c68a0ad 100644 --- a/apps/parent/build.gradle +++ b/apps/parent/build.gradle @@ -56,6 +56,9 @@ android { PrivateData.merge(project, "parent") buildConfigField "String", "LOGIN_CLIENT_ID", "\"$loginClientId\"" buildConfigField "String", "LOGIN_CLIENT_SECRET", "\"$loginClientSecret\"" + addManifestPlaceholders([ + fabricApiKey:"$fabricApiKey" + ]) } bundle { diff --git a/apps/parent/src/main/AndroidManifest.xml b/apps/parent/src/main/AndroidManifest.xml index 8de5638f04..8b33a642c4 100644 --- a/apps/parent/src/main/AndroidManifest.xml +++ b/apps/parent/src/main/AndroidManifest.xml @@ -126,6 +126,10 @@ + + diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/ApplicationManager.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/ApplicationManager.kt index 4f1723059f..2afac0c378 100644 --- a/apps/parent/src/main/java/com/instructure/parentapp/util/ApplicationManager.kt +++ b/apps/parent/src/main/java/com/instructure/parentapp/util/ApplicationManager.kt @@ -20,6 +20,7 @@ import android.content.Context import android.util.Log import android.webkit.WebView import com.crashlytics.android.Crashlytics +import com.crashlytics.android.core.CrashlyticsCore import com.google.android.play.core.missingsplits.MissingSplitsManagerFactory import com.instructure.canvasapi2.AppManager import com.instructure.loginapi.login.tasks.LogoutTask @@ -42,7 +43,10 @@ class ApplicationManager : AppManager() { super.onCreate() - Fabric.with(this, Crashlytics()) + val crashlytics = Crashlytics.Builder() + .core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()) + .build() + Fabric.with(this, crashlytics) // there appears to be a bug when the user is installing/updating the android webview stuff. // http://code.google.com/p/android/issues/detail?id=175124 diff --git a/apps/teacher/build.gradle b/apps/teacher/build.gradle index 7719b717e7..5c9c2b07fe 100644 --- a/apps/teacher/build.gradle +++ b/apps/teacher/build.gradle @@ -43,7 +43,7 @@ android { defaultConfig { minSdkVersion Versions.MIN_SDK targetSdkVersion Versions.TARGET_SDK - versionCode = 25 + versionCode = 26 versionName = '1.9.1' vectorDrawables.useSupportLibrary = true multiDexEnabled true @@ -70,7 +70,9 @@ android { /* Add private data */ PrivateData.merge(project, "teacher") - + addManifestPlaceholders([ + fabricApiKey:"$fabricApiKey" + ]) buildConfigField "String", "PSPDFKIT_LICENSE_KEY", "\"$pspdfkitLicenseKey\"" } diff --git a/apps/teacher/src/main/AndroidManifest.xml b/apps/teacher/src/main/AndroidManifest.xml index 61573117bb..9c1f942978 100644 --- a/apps/teacher/src/main/AndroidManifest.xml +++ b/apps/teacher/src/main/AndroidManifest.xml @@ -178,6 +178,10 @@ android:configChanges="orientation|screenSize" android:theme="@style/Theme.AppCompat.NoActionBar"/> + +