Skip to content

Commit 5f32afd

Browse files
committed
Update Non-Major Dependencies
1 parent 400a7a0 commit 5f32afd

File tree

6 files changed

+172
-149
lines changed

6 files changed

+172
-149
lines changed

app/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,34 +105,34 @@ def getApiKey(String property) {
105105

106106
dependencies {
107107
implementation fileTree(include: ['*.jar'], dir: 'libs')
108-
implementation 'androidx.appcompat:appcompat:1.2.0'
108+
implementation 'androidx.appcompat:appcompat:1.3.0'
109109
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
110110
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
111111
implementation 'androidx.multidex:multidex:2.0.1'
112112
implementation 'androidx.cardview:cardview:1.0.0'
113-
implementation "androidx.recyclerview:recyclerview:1.1.0"
113+
implementation "androidx.recyclerview:recyclerview:1.2.1"
114114
implementation 'androidx.preference:preference:1.1.1'
115-
implementation 'com.google.android.material:material:1.2.1'
115+
implementation 'com.google.android.material:material:1.4.0'
116116
implementation 'org.jetbrains:annotations:21.0.1'
117117
implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
118118
implementation 'com.codemybrainsout.onboarding:onboarder:1.0.4'
119119
implementation 'com.github.MFlisar:changelog:1.1.7'
120120

121121
// Firebase
122-
implementation platform('com.google.firebase:firebase-bom:26.0.0')
122+
implementation platform('com.google.firebase:firebase-bom:26.8.0')
123123
implementation 'com.google.firebase:firebase-ads'
124124
implementation 'com.google.firebase:firebase-messaging'
125125
implementation 'com.google.firebase:firebase-analytics'
126126
implementation 'com.google.firebase:firebase-crashlytics'
127127

128128
// Favorites parsing
129-
implementation 'com.google.code.gson:gson:2.8.5'
130-
implementation 'com.google.guava:guava:30.1.1-android'
129+
implementation 'com.google.code.gson:gson:2.8.7'
130+
implementation 'com.google.guava:guava:30.1.1-jre'
131131

132132
// Settings, About, Feedback
133133
implementation 'com.codemybrainsout.rating:ratingdialog:1.0.8'
134134
implementation 'com.github.eggheadgames:android-about-box:2.0.1'
135-
implementation 'com.mikepenz:aboutlibraries:8.3.1'
135+
implementation 'com.mikepenz:aboutlibraries:8.9.0'
136136
implementation 'org.rm3l:maoni:9.1.0@aar'
137137
implementation 'org.rm3l:maoni-email:9.1.0@aar'
138138
api 'org.rm3l:maoni-common:9.1.0@aar'
@@ -142,17 +142,17 @@ dependencies {
142142
implementation 'com.apollographql.apollo:apollo-runtime:2.5.9'
143143
implementation 'com.apollographql.apollo:apollo-http-cache:2.5.9'
144144
implementation 'com.apollographql.apollo:apollo-rx2-support:2.5.9'
145-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
145+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
146146

147147
// Google Play Billing
148-
implementation 'com.android.billingclient:billing:3.0.1'
148+
implementation 'com.android.billingclient:billing:3.0.3'
149149

150150
// Testing dependencies
151151
implementation 'androidx.test.espresso:espresso-contrib:3.4.0' // Needed for idler
152152
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
153-
testImplementation 'junit:junit:4.13'
153+
testImplementation 'junit:junit:4.13.2'
154154
testImplementation 'org.mockito:mockito-core:3.11.2'
155-
testImplementation 'org.robolectric:robolectric:4.2.1' // Can't be upgraded until #5454 is fixed
155+
testImplementation 'org.robolectric:robolectric:4.6.1' // Can't be upgraded until #5454 is fixed
156156
testImplementation 'androidx.test:core:1.4.0'
157157
testImplementation 'androidx.test:rules:1.4.0'
158158
testImplementation 'androidx.test.espresso:espresso-intents:3.4.0'

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ buildscript {
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:3.6.4'
11-
classpath 'com.google.gms:google-services:4.3.3'
11+
classpath 'com.google.gms:google-services:4.3.8'
1212
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.9'
13-
classpath 'org.jacoco:org.jacoco.core:0.8.2'
14-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
13+
classpath 'org.jacoco:org.jacoco.core:0.8.7'
14+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
1515

1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.jar

5.44 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Sep 19 09:35:26 EDT 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

gradlew

Lines changed: 68 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,59 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
521
## Gradle start up script for UN*X
622
##
723
##############################################################################
824

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
1142

1243
APP_NAME="Gradle"
1344
APP_BASE_NAME=`basename "$0"`
1445

46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
1549
# Use the maximum available, or set MAX_FD != -1 to use that value.
1650
MAX_FD="maximum"
1751

18-
warn ( ) {
52+
warn () {
1953
echo "$*"
2054
}
2155

22-
die ( ) {
56+
die () {
2357
echo
2458
echo "$*"
2559
echo
@@ -30,6 +64,7 @@ die ( ) {
3064
cygwin=false
3165
msys=false
3266
darwin=false
67+
nonstop=false
3368
case "`uname`" in
3469
CYGWIN* )
3570
cygwin=true
@@ -40,28 +75,14 @@ case "`uname`" in
4075
MINGW* )
4176
msys=true
4277
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
4381
esac
4482

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6484

85+
6586
# Determine the Java command to use to start the JVM.
6687
if [ -n "$JAVA_HOME" ] ; then
6788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -85,7 +106,7 @@ location of your Java installation."
85106
fi
86107

87108
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
89110
MAX_FD_LIMIT=`ulimit -H -n`
90111
if [ $? -eq 0 ] ; then
91112
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,10 +126,11 @@ if $darwin; then
105126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106127
fi
107128

108-
# For Cygwin, switch paths to Windows format before running java
109-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
110131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
112134
JAVACMD=`cygpath --unix "$JAVACMD"`
113135

114136
# We build the pattern for arguments to be converted via cygpath
@@ -134,27 +156,30 @@ if $cygwin ; then
134156
else
135157
eval `echo args$i`="\"$arg\""
136158
fi
137-
i=$((i+1))
159+
i=`expr $i + 1`
138160
done
139161
case $i in
140-
(0) set -- ;;
141-
(1) set -- "$args0" ;;
142-
(2) set -- "$args0" "$args1" ;;
143-
(3) set -- "$args0" "$args1" "$args2" ;;
144-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150172
esac
151173
fi
152174

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
156179
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
159184

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
185+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)