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 --- .idea/compiler.xml | 6 ++++ .idea/misc.xml | 2 +- app/build.gradle | 6 ++-- build.gradle | 2 +- buildSrc/src/main/kotlin/Versions.kt | 8 ++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 53 +++++++++++++++++++------------ gradlew.bat | 22 ++++++++++++- 10 files changed, 69 insertions(+), 35 deletions(-) create mode 100644 .idea/compiler.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..61a9130c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b0c7b20c..3386629a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + 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}" diff --git a/build.gradle b/build.gradle index 8811522b..4d3296f5 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { classpath kau.Plugins.kotlin classpath kau.Plugins.bugsnag classpath kau.Plugins.spotless - classpath kau.Plugins.dexCount +// classpath kau.Plugins.dexCount classpath kau.Plugins.gitVersion } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3e33e6f1..cf697cea 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -10,19 +10,17 @@ object Versions { const val apacheCommonsText = "1.4" // https://github.com/brianwernick/ExoMedia/releases const val exoMedia = "4.3.0" - // https://github.com/mockk/mockk/releases - const val mockk = "1.9.3" // https://github.com/jhy/jsoup/releases const val jsoup = "1.13.1" // https://square.github.io/okhttp/changelog/ - const val okhttp = "4.3.1" + const val okhttp = "4.7.2" // https://developer.android.com/jetpack/androidx/releases/room - const val room = "2.2.3" + const val room = "2.2.5" // http://robolectric.org/getting-started/ const val roboelectric = "4.3" // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start const val scaleImageView = "3.10.0" // https://github.com/node-gradle/gradle-node-plugin/releases - const val nodeGradle = "2.2.3" + const val nodeGradle = "2.2.4" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1aa21540..c06541ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=9aff74e +KAU=813f386 android.useAndroidX=true android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee..62d4c053 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index beef26ac..186b7155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Dec 30 19:23:47 PST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d5..fbd7c515 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162..5093609d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% -- 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(-) 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(-) 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 From 9a2f0cde424781ae8b33e05efc1a8d6954ece026 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 28 Jun 2020 01:05:39 -0700 Subject: Remove bugsnag imports --- app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt | 1 - app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 1 - 2 files changed, 2 deletions(-) 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 7b1532b7..67d2f55a 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt @@ -18,7 +18,6 @@ package com.pitchedapps.frost.utils import ca.allanwang.kau.logging.KauLogger import ca.allanwang.kau.logging.KauLoggerExtension -import com.bugsnag.android.Bugsnag import com.pitchedapps.frost.BuildConfig /** 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 5fd11005..bfd0d2c0 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -23,7 +23,6 @@ import ca.allanwang.kau.kpref.KPrefFactory import ca.allanwang.kau.utils.colorToForeground import ca.allanwang.kau.utils.isColorVisibleOn import ca.allanwang.kau.utils.withAlpha -import com.bugsnag.android.Bugsnag import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.enums.FACEBOOK_BLUE import com.pitchedapps.frost.enums.FeedSort -- cgit v1.2.3