Skip to content

fix #3 + upgrade sdk + upgrade libraries #5

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
Oct 8, 2021
Merged

fix #3 + upgrade sdk + upgrade libraries #5

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
045fea9
Update libraries versions + fix deprecated keywords/errors
pablogalve Oct 6, 2021
26949da
Enable "Take Survey" that uses flutter_webview_plugin
pablogalve Oct 7, 2021
dabfafa
Add null safety + upgrade sdk version
pablogalve Oct 8, 2021
1c4cd1c
fix #3 Remove flutter_webview_plugin (deprecated) to start using webv…
pablogalve Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Space_Mapper/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
Project background_geolocation = project(':flutter_background_geolocation')
apply from: "${background_geolocation.projectDir}/background_geolocation.gradle"


def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
Expand All @@ -48,7 +49,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "edu.princeton.jrpalmer.asm"
minSdkVersion 16
minSdkVersion 20
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
10 changes: 9 additions & 1 deletion Space_Mapper/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
targetSdkVersion = 29 // or higher
appCompatVersion = "1.0.2" // or higher
playServicesLocationVersion = "17.0.0" // or higher
}
}
repositories {
google()
jcenter()
Expand All @@ -21,6 +21,14 @@ allprojects {
repositories {
google()
jcenter()
maven {
// [required] flutter_background_geolocation
url "${project(':flutter_background_geolocation').projectDir}/libs"
}
maven {
// [required] background_fetch
url "${project(':background_fetch').projectDir}/libs"
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Space_Mapper/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true
1 change: 0 additions & 1 deletion Space_Mapper/build/10a1995013f1be64304dc061d8bf01b9/_composite.stamp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Space_Mapper/build/10a1995013f1be64304dc061d8bf01b9/gen_dart_plugin_registrant.stamp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Space_Mapper/build/10a1995013f1be64304dc061d8bf01b9/gen_localizations.stamp
View file
Open in desktop

This file was deleted.

2,125 changes: 1,072 additions & 1,053 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/debug.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,23 @@
"endOffsets": "2880,3068,3196,3308,3517,3641,3792,3923,4350,4460,4648,4777,4975,5159,5255,5348,5456"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5541",
"endColumns": "100",
"endOffsets": "5637"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\ce4cf89a33ded15216b272ad8910c428\\appcompat-1.0.2\\res\\values-af\\values-af.xml",
"from": {
Expand All @@ -53,23 +70,6 @@
"endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79",
"endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,5536"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5541",
"endColumns": "100",
"endOffsets": "5637"
}
}
]
}
Expand Down
34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,6 @@
"endOffsets": "2837,3008,3132,3236,3422,3547,3685,3816,4194,4299,4475,4600,4794,4951,5041,5128,5228"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5312",
"endColumns": "100",
"endOffsets": "5408"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\ce4cf89a33ded15216b272ad8910c428\\appcompat-1.0.2\\res\\values-am\\values-am.xml",
"from": {
Expand Down Expand Up @@ -70,6 +53,23 @@
"endColumns": "190",
"endOffsets": "4007"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5312",
"endColumns": "100",
"endOffsets": "5408"
}
}
]
}
Expand Down
34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,23 @@
"endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,5440"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5445",
"endColumns": "100",
"endOffsets": "5541"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\a6ce1c457108fb1ae1f05fab47ff313c\\jetified-play-services-basement-17.0.0\\res\\values-ar\\values.xml",
"from": {
Expand All @@ -37,23 +54,6 @@
"endOffsets": "4075"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5445",
"endColumns": "100",
"endOffsets": "5541"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\a9275bb3354f6d1d34227a45b5737530\\jetified-play-services-base-17.0.0\\res\\values-ar\\values.xml",
"from": {
Expand Down
34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-as.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
{
"outputFile": "C:\\Users\\Pablo Galve\\OneDrive\\Documentos\\GitHub\\space_mapper\\Space_Mapper\\build\\app\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
"map": [
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5559",
"endColumns": "100",
"endOffsets": "5655"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\ce4cf89a33ded15216b272ad8910c428\\appcompat-1.0.2\\res\\values-as\\values-as.xml",
"from": {
Expand Down Expand Up @@ -37,23 +54,6 @@
"endOffsets": "4171"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5559",
"endColumns": "100",
"endOffsets": "5655"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\a9275bb3354f6d1d34227a45b5737530\\jetified-play-services-base-17.0.0\\res\\values-as\\values.xml",
"from": {
Expand Down
2 changes: 1 addition & 1 deletion Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-az.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-az\\values-az.xml",
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-az\\values-az.xml",
"from": {
"startLines": "2",
"startColumns": "4",
Expand Down
34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,23 @@
"endOffsets": "2931,3119,3247,3359,3572,3701,3843,3974,4371,4480,4671,4800,5008,5180,5278,5373,5482"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5571",
"endColumns": "100",
"endOffsets": "5667"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\a6ce1c457108fb1ae1f05fab47ff313c\\jetified-play-services-basement-17.0.0\\res\\values-b+sr+Latn\\values.xml",
"from": {
Expand Down Expand Up @@ -53,23 +70,6 @@
"endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
"endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,5566"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5571",
"endColumns": "100",
"endOffsets": "5667"
}
}
]
}
Expand Down
34 changes: 17 additions & 17 deletions Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,23 @@
"endOffsets": "2938,3132,3259,3371,3585,3713,3858,3991,4417,4526,4720,4850,5062,5251,5350,5442,5550"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5636",
"endColumns": "100",
"endOffsets": "5732"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\ce4cf89a33ded15216b272ad8910c428\\appcompat-1.0.2\\res\\values-be\\values-be.xml",
"from": {
Expand Down Expand Up @@ -53,23 +70,6 @@
"endColumns": "204",
"endOffsets": "4196"
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "48",
"startColumns": "4",
"startOffsets": "5636",
"endColumns": "100",
"endOffsets": "5732"
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion Space_Mapper/build/app/intermediates/blame/res/debug/multi-v2/values-bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
{
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\cdcb21ce1a8a7fa61d511923b4b75aa1\\core-1.1.0\\res\\values-bg\\values-bg.xml",
"source": "C:\\Users\\Pablo Galve\\.gradle\\caches\\transforms-2\\files-2.1\\62e089180089a465608bc63675af4406\\core-1.3.1\\res\\values-bg\\values-bg.xml",
"from": {
"startLines": "2",
"startColumns": "4",
Expand Down
Loading