Skip to content

Commit

Permalink
NTV-378: Bumblebee updates (#1529)
Browse files Browse the repository at this point in the history
  • Loading branch information
Arkariang committed Jan 27, 2022
1 parent 380d8d1 commit 6c73971
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 138 deletions.
64 changes: 34 additions & 30 deletions Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.4)
CFPropertyList (3.0.5)
rexml
activesupport (6.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -16,7 +16,7 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.522.0)
aws-partitions (1.550.0)
aws-sdk (3.0.2)
aws-sdk-resources (~> 3)
aws-sdk-accessanalyzer (1.21.0)
Expand Down Expand Up @@ -208,9 +208,9 @@ GEM
aws-sdk-connectparticipant (1.13.0)
aws-sdk-core (~> 3, >= 3.119.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.121.5)
aws-sdk-core (3.125.5)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.520.1)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-costandusagereportservice (1.33.0)
Expand Down Expand Up @@ -468,8 +468,8 @@ GEM
aws-sdk-kinesisvideosignalingchannels (1.12.0)
aws-sdk-core (~> 3, >= 3.119.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.50.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sdk-kms (1.53.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-lakeformation (1.16.0)
aws-sdk-core (~> 3, >= 3.119.0)
Expand Down Expand Up @@ -964,8 +964,8 @@ GEM
aws-sdk-route53resolver (1.28.0)
aws-sdk-core (~> 3, >= 3.119.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.104.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sdk-s3 (1.111.3)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sdk-s3control (1.38.0)
Expand Down Expand Up @@ -1122,7 +1122,7 @@ GEM
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.0.3)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
Expand All @@ -1137,17 +1137,18 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
emoji_regex (3.2.3)
excon (0.88.0)
faraday (1.8.0)
excon (0.90.0)
faraday (1.9.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
Expand All @@ -1156,14 +1157,17 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.5)
fastlane (2.197.0)
fastimage (2.2.6)
fastlane (2.202.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -1202,15 +1206,15 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-aws_s3 (2.0.2)
fastlane-plugin-aws_s3 (2.0.3)
apktools (~> 0.7)
aws-sdk-s3 (~> 1)
mime-types (~> 3.3)
fastlane-plugin-firebase_app_distribution (0.2.9)
fastlane-plugin-firebase_app_distribution (0.3.2)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.13.0)
google-apis-androidpublisher_v3 (0.15.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-core (0.4.1)
google-apis-core (0.4.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -1219,20 +1223,20 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.8.0)
google-apis-iamcredentials_v1 (0.10.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-playcustomapp_v1 (0.6.0)
google-apis-playcustomapp_v1 (0.7.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.9.0)
google-apis-storage_v1 (0.11.0)
google-apis-core (>= 0.4, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.34.1)
addressable (~> 2.5)
google-cloud-storage (1.36.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
Expand All @@ -1252,13 +1256,13 @@ GEM
httpclient (2.8.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
jmespath (1.5.0)
json (2.6.1)
jwt (2.3.0)
memoist (0.16.2)
mime-types (3.3.1)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0704)
mime-types-data (3.2022.0105)
mini_magick (4.11.0)
mini_mime (1.1.2)
minitest (5.14.4)
Expand All @@ -1267,7 +1271,7 @@ GEM
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
os (1.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (4.0.6)
rainbow (3.0.0)
Expand All @@ -1293,7 +1297,7 @@ GEM
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
trailblazer-option (0.1.1)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-spinner (0.9.3)
Expand Down
23 changes: 10 additions & 13 deletions app/build.gradle
Expand Up @@ -55,8 +55,8 @@ android {

// Enable Multidex to support over 65K methods
multiDexEnabled true
resConfigs 'de', 'es', 'en', 'fr', 'ja'

resConfigs "de", "es", "en", "fr", "ja"

def fabricProps = new Properties()
file("fabric.properties").withInputStream { fabricProps.load(it) }
Expand Down Expand Up @@ -132,21 +132,14 @@ android {
viewBinding true
}

lintOptions {
disable 'NonConstantResourceId'
quiet true
warningsAsErrors true
abortOnError false
}

packagingOptions {
jniLibs {
useLegacyPackaging = true
}
exclude 'META-INF/LICENSE.txt'
exclude 'LICENSE.txt'
exclude 'META-INF/AL2.0'
exclude 'META-INF/LGPL2.1'
resources {
excludes += ['META-INF/LICENSE.txt', 'LICENSE.txt', 'META-INF/AL2.0', 'META-INF/LGPL2.1']
}
}

testOptions {
Expand All @@ -161,6 +154,10 @@ android {
setIgnore(true)
}
}
lint {
abortOnError false
warningsAsErrors true
}

}

Expand Down Expand Up @@ -257,12 +254,12 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828'

// Firebase
implementation platform('com.google.firebase:firebase-bom:29.0.2')
implementation platform('com.google.firebase:firebase-bom:29.0.4')
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-analytics-ktx'
implementation 'com.google.firebase:firebase-perf-ktx'
implementation "com.google.firebase:firebase-messaging"
implementation 'com.google.firebase:firebase-inappmessaging-display'
implementation 'com.google.firebase:firebase-perf'

// Testing
testImplementation "junit:junit:4.13.2"
Expand Down
5 changes: 0 additions & 5 deletions app/lint.xml
Expand Up @@ -30,11 +30,6 @@
<ignore path="**/*$$ViewBinder.java" />
</issue>

<issue id="TrustAllX509TrustManager">
<!-- We don't make HTTP requests using Jsoup, safe to ignore. -->
<ignore path="org/jsoup/helper/*" severity="ignore" />
</issue>

<!-- UseCompoundDrawables suggests combining a LinearLayout with an ImageView and TextView into a single
TextView with the image as the drawable, but typically our ImageViews require fetching an image dynamically
rather than simply specifiying a drawable. -->
Expand Down
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Expand Up @@ -210,7 +210,6 @@
<activity
android:name=".ui.activities.ProjectUpdatesActivity"
android:parentActivityName=".ui.activities.ProjectActivity" />
<activity android:name="com.qualtrics.digital.QualtricsSurveyActivity" />
<activity
android:name=".ui.activities.SearchActivity"
android:parentActivityName=".ui.activities.DiscoveryActivity"
Expand Down
68 changes: 0 additions & 68 deletions app/src/main/res/layout-land/app_rating_prompt.xml

This file was deleted.

5 changes: 2 additions & 3 deletions build.gradle
Expand Up @@ -8,12 +8,11 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.0'
classpath 'com.google.gms:google-services:4.3.10'
classpath "org.jacoco:org.jacoco.core:$jacoco_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// updating performance plugin causes the jacoco plugin for code coverage to drop to 0 for some unknown reason
classpath 'com.google.firebase:perf-plugin:1.3.5'
classpath "com.google.firebase:perf-plugin:1.4.1"
}
}

Expand Down

0 comments on commit 6c73971

Please sign in to comment.