Skip to content

Commit

Permalink
feat(template): Set min Android SDK to 21 (#836)
Browse files Browse the repository at this point in the history 
* feat: bump default min android version to 21

* feat: update the VS UI
  • Loading branch information
@Plac3hold3r
Plac3hold3r committed Oct 1, 2020
1 parent 5bcd500 commit 7c433f8
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/MvxScaffolding.Core/Configuration/TemplateConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static class TemplateConfig
["14"] = "Android 4 - Ice Cream Sandwich v14",
};

public static string MinAndroidSDKOptionDefault => "19";
public static string MinAndroidSDKOptionDefault => "21";

public static Dictionary<string, string> MinIosSDKOptions => new Dictionary<string, string>
{
Expand Down
4 changes: 2 additions & 2 deletions src/Templates/MvxForms/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
"AndroidMinSDKVersion": {
"type": "parameter",
"datatype": "choice",
"defaultValue": "19",
"defaultValue": "21",
"description": "Minimum Android target SDK version.",
"choices": [
{
Expand Down Expand Up @@ -467,7 +467,7 @@
"description": "Android 4 - Ice Cream Sandwich v14"
}
],
"replaces": "19",
"replaces": "21",
"onlyIf": [
{
"after": "android:minSdkVersion=\""
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/MvxForms/Blank/src/MvxFormsTemp.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
Expand Down
27 changes: 7 additions & 20 deletions src/Templates/MvxForms/NavigationMenu/src/MvxFormsTemp.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="1"
android:versionName="1.0"
package="com.mvxscaffolding.app"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="29" />
<application
android:allowBackup="true"
android:theme="@style/AppTheme"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:resizeableActivity="true">
<meta-data
android:name="android.max_aspect"
android:value="2.1" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
</manifest>
4 changes: 2 additions & 2 deletions src/Templates/MvxForms/Shared/test/MvxFormsTemp.Droid.Test/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MvxFormsTemp.Droid.Test.MvxFormsTemp.Droid.Test" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MvxFormsTemp.Droid.Test.MvxFormsTemp.Droid.Test" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:label="MvxFormsTemp.Droid.Test"></application>
</manifest>
2 changes: 1 addition & 1 deletion src/Templates/MvxForms/SingleView/src/MvxFormsTemp.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
Expand Down
4 changes: 2 additions & 2 deletions src/Templates/MvxNative/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
"AndroidMinSDKVersion": {
"type": "parameter",
"datatype": "choice",
"defaultValue": "19",
"defaultValue": "21",
"description": "Minimum Android SDK version.",
"choices": [
{
Expand Down Expand Up @@ -520,7 +520,7 @@
"description": "Android 4 - Ice Cream Sandwich v14"
}
],
"replaces": "19",
"replaces": "21",
"onlyIf": [
{
"after": "android:minSdkVersion=\""
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/MvxNative/Blank/src/MvxNative.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/MvxNative/NavigationMenu/src/MvxNative.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
Expand Down
4 changes: 2 additions & 2 deletions src/Templates/MvxNative/Shared/test/MvxNative.Droid.Test/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MvxNative.Droid.Test.MvxNative.Droid.Test" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MvxNative.Droid.Test.MvxNative.Droid.Test" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:label="MvxNative.Droid.Test"></application>
</manifest>
2 changes: 1 addition & 1 deletion src/Templates/MvxNative/SingleView/src/MvxNative.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.mvxscaffolding.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:theme="@style/AppTheme" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:resizeableActivity="true">
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>
Expand Down

0 comments on commit 7c433f8

Please sign in to comment.