Skip to content
This repository has been archived by the owner on Jan 5, 2023. It is now read-only.

Fix build project and fix crash Google Maps SDK when target 28 or above #300

Open
wants to merge 2 commits into
base: iosched_2020
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android:
components:
- tools
- platform-tools
- build-tools-27.0.3
- build-tools-28.0.2
- android-28
- addon-google_apis-google-28
- extra-google-m2repository
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ buildscript {
targetSdkVersion = 28

// App dependencies
androidGradlePluginVersion = '3.2.0-beta04'
androidGradlePluginVersion = '3.2.0'
appcompatVersion = '1.0.0-beta01'
browserVersion = '1.0.0-beta01'
constraintLayoutVersion = '1.1.2'
Expand All @@ -55,14 +55,14 @@ buildscript {
gsonVersion = "2.8.1"
hamcrestVersion = '1.3'
junitVersion = '4.12'
kotlinVersion = '1.2.50'
kotlinVersion = '1.2.51'
ktxVersion = "1.0.0-beta01"
leakCanaryVersion = "1.5.4"
leanbackVersion = '1.0.0-beta01'
legacySupportVersion = '1.0.0-alpha1'
lifecycleVersion = '2.0.0-beta01'
lottieVersion = "2.5.1"
materialVersion = '1.0.0-beta01'
materialVersion = '1.0.0'
mockitoVersion = "2.8.9"
mockitoKotlinVersion = "1.5.0"
okhttpVersion = "3.10.0"
Expand Down
4 changes: 4 additions & 0 deletions mobile/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
android:name="firebase_crashlytics_collection_enabled"
android:value="${crashlyticsEnabled}" />

<uses-library
android:name="org.apache.http.legacy"
android:required="false" />

</application>

</manifest>
2 changes: 1 addition & 1 deletion mobile/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<item name="textAllCaps">false</item>
</style>

<style name="TextAppearance.IOSched.BottomNavigationView" parent="@style/TextAppearance.MaterialComponents.BottomNavigationView.Colored">
<style name="TextAppearance.IOSched.BottomNavigationView" parent="@style/Widget.MaterialComponents.BottomNavigationView.Colored">
<item name="android:fontFamily">@font/google_sans</item>
<item name="android:textColor">@color/bottom_nav_item</item>
</style>
Expand Down