From 36d707365facb93b9b4e593027fbe9939c46b1c0 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 27 Jun 2020 23:48:00 -0700 Subject: Update AS and gradle --- app/build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 1899058e..d38519a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.bugsnag.android.gradle' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'com.getkeepsafe.dexcount' +//apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'com.gladed.androidgitversion' @@ -188,7 +188,7 @@ android { // Always show the result of every unit test, even if it passes. all { testLogging { - events 'passed', 'skipped', 'failed', 'standardError' + events 'skipped', 'failed', 'standardError' } } } @@ -268,8 +268,6 @@ dependencies { testImplementation kau.Dependencies.koinTest androidTestImplementation kau.Dependencies.koinTest -// androidTestImplementation "io.mockk:mockk:${Versions.mockk}" - implementation kau.Dependencies.coroutines implementation "org.apache.commons:commons-text:${Versions.apacheCommonsText}" -- cgit v1.2.3 From c8db2d1d9a3540a39764808b86ddfb92ef97a0e2 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 27 Jun 2020 23:52:40 -0700 Subject: Remove hardcoded version info --- .travis.yml | 2 +- app/build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/build.gradle') diff --git a/.travis.yml b/.travis.yml index 52bd3470..448fe17b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ after_success: - "./generate-apk-release.sh" script: - "./gradlew --quiet androidGitVersion" - - "./gradlew lintReleaseTest testReleaseUnitTest assembleReleaseTest" + - "./gradlew spotlessCheck lintReleaseTest testReleaseUnitTest assembleReleaseTest" notifications: email: false slack: diff --git a/app/build.gradle b/app/build.gradle index d38519a2..12f03b83 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,10 +35,10 @@ android { applicationId "${project.APP_GROUP}.${project.APP_ID.toLowerCase(Locale.CANADA)}" minSdkVersion kau.Versions.minSdk targetSdkVersion Versions.targetSdk - versionCode 2040500 -// versionCode androidGitVersion.code() - versionName '2.4.5' -// versionName androidGitVersion.name() +// versionCode 2040500 + versionCode androidGitVersion.code() +// versionName '2.4.5' + versionName androidGitVersion.name() if (System.getenv('TRAVIS') != 'true') { // Verification for F-Droid builds -- cgit v1.2.3 From 9d0feeed6a6aa4e88a115e06778f215faaefc3a8 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 28 Jun 2020 00:59:58 -0700 Subject: Disable bugsnag --- app/build.gradle | 4 +--- app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt | 2 +- app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt | 12 ++++++------ .../main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 18 +++++++++--------- gradle.properties | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 12f03b83..c8d46967 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: 'com.bugsnag.android.gradle' +//apply plugin: 'com.bugsnag.android.gradle' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' @@ -350,5 +350,3 @@ task createGithubReleaseApk { tasks.findByName('testGithubReleaseApk').mustRunAfter 'lintGithubReleaseApk' tasks.findByName('assembleGithubReleaseApk').mustRunAfter 'testGithubReleaseApk' } - -apply plugin: 'com.bugsnag.android.gradle' \ No newline at end of file diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt index 34808e65..247011ac 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt @@ -75,7 +75,7 @@ class FrostApp : Application(), KoinComponent { prefs = get() showcasePrefs = get() initPrefs() - initBugsnag() +// initBugsnag() L.i { "Begin Frost for Facebook" } FrostPglAdBlock.init(this) diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt index 974047e8..7b1532b7 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt @@ -63,12 +63,12 @@ object L : KauLogger("Frost") { if (BuildConfig.DEBUG || !hasAnalytics()) { super.logImpl(priority, message, t) } else { - if (message != null) { - Bugsnag.leaveBreadcrumb(message) - } - if (t != null) { - Bugsnag.notify(t) - } +// if (message != null) { +// Bugsnag.leaveBreadcrumb(message) +// } +// if (t != null) { +// Bugsnag.notify(t) +// } } } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt index 1dfd6871..5fd11005 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -165,15 +165,15 @@ class Prefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs" var verboseLogging: Boolean by kpref("verbose_logging", false) var analytics: Boolean by kpref("analytics", false) { - if (!BuildConfig.DEBUG) { - if (it) { - Bugsnag.setAutoCaptureSessions(true) - Bugsnag.enableExceptionHandler() - } else { - Bugsnag.setAutoCaptureSessions(false) - Bugsnag.disableExceptionHandler() - } - } +// if (!BuildConfig.DEBUG) { +// if (it) { +// Bugsnag.setAutoCaptureSessions(true) +// Bugsnag.enableExceptionHandler() +// } else { +// Bugsnag.setAutoCaptureSessions(false) +// Bugsnag.disableExceptionHandler() +// } +// } } var biometricsEnabled: Boolean by kpref("biometrics_enabled", false) diff --git a/gradle.properties b/gradle.properties index c06541ab..ebda70b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=813f386 +KAU=ceed2ad android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3