Skip to content

Commit bce8394

Browse files
authored
Merge pull request #1313 from NativeScript/trifonov/manifest-remove-not-needed
chore: remove min/target SdkVersion from manifest
2 parents 060a268 + 00e39a1 commit bce8394

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ matrix:
3333
- emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
3434
- android-wait-for-emulator
3535
- npm install --prefix ./test-app/tools
36-
- "./gradlew runSbgTests --stacktrace"
37-
- "./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace"
36+
- "./gradlew runSbgTests --stacktrace && ./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace"
3837
- adb -e logcat -d
3938
before_install:
4039
- echo "y" | sdkmanager "cmake;3.6.4111459"

build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,28 @@
99
android:normalScreens="true"
1010
android:largeScreens="true"
1111
android:xlargeScreens="true"/>
12-
13-
<uses-sdk
14-
android:minSdkVersion="17"
15-
android:targetSdkVersion="__APILEVEL__"/>
16-
12+
1713
<uses-permission android:name="android.permission.INTERNET"/>
18-
14+
1915
<application
2016
android:name="com.tns.NativeScriptApplication"
2117
android:allowBackup="true"
2218
android:icon="@drawable/icon"
2319
android:label="@string/app_name"
2420
android:theme="@style/AppTheme" >
25-
<activity
21+
<activity
2622
android:name="com.tns.NativeScriptActivity"
2723
android:label="@string/title_activity_kimera"
2824
android:configChanges="keyboardHidden|orientation|screenSize">
29-
25+
3026
<intent-filter>
3127
<action android:name="android.intent.action.MAIN" />
3228

3329
<category android:name="android.intent.category.LAUNCHER" />
3430
</intent-filter>
3531
</activity>
3632
<activity android:name="com.tns.ErrorReportActivity"
37-
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
33+
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
3834
</application>
3935

4036
</manifest>

0 commit comments

Comments
 (0)