Skip to content

Fix open source builds #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 4, 2019
Merged

Fix open source builds #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84f3658
Update .gitignore
bootstraponline Apr 4, 2019
f490cbb
Update files.list and open_source.sh
bootstraponline Apr 4, 2019
8982d10
Update trial key for open source
bootstraponline Apr 4, 2019
26e3d72
Update mobilesdk_app_id
bootstraponline Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Private data
android-private-data/
**/PrivateConst.kt
private-data/

# Release keys
android-keys/
Expand Down
2 changes: 1 addition & 1 deletion open_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -ex

# Open source users: Run this script before building.
rm private-data
mv open_source_data private-data
cp -R open_source_data private-data
21 changes: 21 additions & 0 deletions open_source_data/foosball/files.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,24 @@ tablet/google-services.json=app/src/tablet/google-services.json
# Fabric key
fabric.properties=app/fabric.properties

# Commentator MP3s
tablet/raw/bagel_song.mp3=app/src/tablet/res/raw/bagel_song.mp3
tablet/raw/ding.mp3=app/src/tablet/res/raw/ding.mp3
tablet/raw/ding_ding.mp3=app/src/tablet/res/raw/ding_ding.mp3
tablet/raw/ding_reverse.mp3=app/src/tablet/res/raw/ding_reverse.mp3
tablet/raw/dominating.mp3=app/src/tablet/res/raw/dominating.mp3
tablet/raw/doublekill.mp3=app/src/tablet/res/raw/doublekill.mp3
tablet/raw/firstblood.mp3=app/src/tablet/res/raw/firstblood.mp3
tablet/raw/killingspree.mp3=app/src/tablet/res/raw/killingspree.mp3
tablet/raw/massacre.mp3=app/src/tablet/res/raw/massacre.mp3
tablet/raw/multikill.mp3=app/src/tablet/res/raw/multikill.mp3
tablet/raw/murca.mp3=app/src/tablet/res/raw/murca.mp3
tablet/raw/rotate_ding.mp3=app/src/tablet/res/raw/rotate_ding.mp3
tablet/raw/unstoppable.mp3=app/src/tablet/res/raw/unstoppable.mp3
tablet/raw/motivation.mp3=app/src/tablet/res/raw/motivation.mp3
tablet/raw/leeroy_jenkins.mp3=app/src/tablet/res/raw/leeroy_jenkins.mp3
tablet/raw/illuminati_confirmed.mp3=app/src/tablet/res/raw/illuminati_confirmed.mp3
tablet/raw/mlg_horn.mp3=app/src/tablet/res/raw/mlg_horn.mp3
tablet/raw/legitness.mp3=app/src/tablet/res/raw/legitness.mp3
tablet/raw/profamity.mp3=app/src/tablet/res/raw/profamity.mp3
tablet/raw/police_siren.mp3=app/src/tablet/res/raw/police_siren.mp3
2 changes: 1 addition & 1 deletion open_source_data/polling/files.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
private.properties=private.properties

# Analytics
global_tracker.xml=app/src/main/res/xml/global_tracker.xml
global_tracker.xml=src/main/res/xml/global_tracker.xml
8 changes: 4 additions & 4 deletions open_source_data/student/files.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
private.properties=private.properties

# Fabric key
fabric.properties=candroid/fabric.properties
fabric.properties=fabric.properties

# Google Services
google-services.json=candroid/google-services.json
google-services.json=google-services.json

# Google Analytics
analytics.xml=candroid/src/main/res/xml/analytics.xml
analytics.xml=src/main/res/xml/analytics.xml

# Polling List & Private Strings
strings.xml=candroid/src/main/res/values/private_strings.xml
strings.xml=src/main/res/values/private_strings.xml
2 changes: 1 addition & 1 deletion open_source_data/student/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"client": [
{
"client_info": {
"mobilesdk_app_id": "2",
"mobilesdk_app_id": "1:111111111111:android:1111111111111111",
Copy link
Contributor

@joehoag joehoag Apr 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not a real id, is it?

Copy link
Contributor Author

@bootstraponline bootstraponline Apr 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Google crashes unless the fake id matches a certain pattern. The id is still fake.

"android_client_info": {
"package_name": "com.instructure.candroid"
}
Expand Down
2 changes: 1 addition & 1 deletion open_source_data/student/private.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pushServiceProjectId=2
# PSPDFKit
pspdfMavenUser=pspdfkit
pspdfMavenPass=jZdwMw7uqYGuKc6RxYLuEPwYqyvYQQ
pspdfkitLicenseKey=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
pspdfkitLicenseKey=qX28PZZKCLAV0rGUvC-AwPwt0TjPoHHyg3zpa1DlMpukb94wOo1qRD7FAcOMG1fXUo8w_H-4TrDBXAcRso7EECEPbj_D3P_MOxNKqjO9Yin8dEEmbFErWlbXkn2z74fs0vguihzPit6DpqFI0CnL8NYhpth-9A98h9yrJ3_X3waNH-Bn1OcD-cTKSbLNIAkC_4XjcsPKB94l183-r8PqqEfQJOAhU7A4JxWi1HctDNyMac88CzZ_2HQAVHHI_r-oxsmXp9ytjE5r_Z-sfSBsY5btpRqNqfxz0X1j4RoCvw4El-JvqOPtdOQFiIlcunsxPOhg-JgKf6OssSZ_ZeIFed5zPAjE99q0eaC4AZu_HDAp6WJUJhqQpVisRz89Eqcz1nipzVKko-MoivRuMGs69bxiK8c9nth3SDeNEPhPLb9O68TwWNH1bV8jdpTOwmnSheXkKql3T1pe7qrC-w4wuUZvIdOxqW36WQ85JtLf7Cg0u4YLMV1x_5s4Gocs8lifNRSrYo1rN5V6rIaVljtbCMZomQG7BUoVq14hD1YzpR13MyNMY5bNamZ-xmcM74GPdhE_8pNc980FhtoRvqs3zdTNcfzFyoWyjGDFChHZYGtj40nlJiaRr207GJzvxtl0
4 changes: 2 additions & 2 deletions open_source_data/teacher/files.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
private.properties=private.properties

# Fabric
fabric.properties=app/fabric.properties
fabric.properties=fabric.properties

# Google Services
google-services.json=app/google-services.json
google-services.json=google-services.json
2 changes: 1 addition & 1 deletion open_source_data/teacher/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"client": [
{
"client_info": {
"mobilesdk_app_id": "2",
"mobilesdk_app_id": "1:111111111111:android:1111111111111111",
"android_client_info": {
"package_name": "com.instructure.teacher"
}
Expand Down
6 changes: 3 additions & 3 deletions open_source_data/teacher/private.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ roboUser=1

# PSPDFKit
pspdfMavenUser=pspdfkit
pspdfMavenPass=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
pspdfkitLicenseKey=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
pushServiceProjectId=1
pspdfMavenPass=jZdwMw7uqYGuKc6RxYLuEPwYqyvYQQ
pspdfkitLicenseKey=qX28PZZKCLAV0rGUvC-AwPwt0TjPoHHyg3zpa1DlMpukb94wOo1qRD7FAcOMG1fXUo8w_H-4TrDBXAcRso7EECEPbj_D3P_MOxNKqjO9Yin8dEEmbFErWlbXkn2z74fs0vguihzPit6DpqFI0CnL8NYhpth-9A98h9yrJ3_X3waNH-Bn1OcD-cTKSbLNIAkC_4XjcsPKB94l183-r8PqqEfQJOAhU7A4JxWi1HctDNyMac88CzZ_2HQAVHHI_r-oxsmXp9ytjE5r_Z-sfSBsY5btpRqNqfxz0X1j4RoCvw4El-JvqOPtdOQFiIlcunsxPOhg-JgKf6OssSZ_ZeIFed5zPAjE99q0eaC4AZu_HDAp6WJUJhqQpVisRz89Eqcz1nipzVKko-MoivRuMGs69bxiK8c9nth3SDeNEPhPLb9O68TwWNH1bV8jdpTOwmnSheXkKql3T1pe7qrC-w4wuUZvIdOxqW36WQ85JtLf7Cg0u4YLMV1x_5s4Gocs8lifNRSrYo1rN5V6rIaVljtbCMZomQG7BUoVq14hD1YzpR13MyNMY5bNamZ-xmcM74GPdhE_8pNc980FhtoRvqs3zdTNcfzFyoWyjGDFChHZYGtj40nlJiaRr207GJzvxtl0
pushServiceProjectId=1