Skip to content

Commit 52b6d0f

Browse files
authored
Merge pull request #42 from GeoTecINIT/ns8-migration
Ns8 migration + basic Android 12 support
2 parents cdba82b + 96df6a5 commit 52b6d0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+6899
-13719
lines changed

demo/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ npm-debug.log*
1616
yarn-debug.log*
1717
yarn-error.log*
1818
test-reports
19+
coverage
1920

2021
# General
2122
.DS_Store

demo/app/App_Resources/Android/app.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
// create a file named before-plugins.gradle in the current directory and place it there
1111

1212
android {
13-
// todo: remove once ndk 23+ is supported
14-
ndkVersion "22.1.7171670"
1513
defaultConfig {
1614
minSdkVersion 22
1715
generatedDensities = []

demo/app/App_Resources/Android/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
android:name="com.tns.NativeScriptActivity"
2828
android:label="@string/title_activity_kimera"
2929
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
30-
android:theme="@style/LaunchScreenTheme">
30+
android:theme="@style/LaunchScreenTheme"
31+
android:exported="true">
3132

3233
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
3334

demo/app/app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "~@nativescript/theme/css/core.css";
2-
@import "~@nativescript/theme/css/blue.css";
1+
@import "@nativescript/theme/css/core.css";
2+
@import "@nativescript/theme/css/blue.css";
33

44
/* Place any CSS rules you want to apply on both iOS and Android here.
55
This is where the vast majority of your CSS code goes. */

demo/app/test.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { runTestApp } from "@nativescript/unit-test-runner";
2+
// import other polyfills here
3+
4+
declare let require: any;
5+
6+
runTestApp({
7+
runTests: () => {
8+
const tests = require.context("./", true, /\.spec\.ts$/);
9+
tests.keys().map(tests);
10+
},
11+
});
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)