Skip to content

Commit d00c14d

Browse files
rigor789rigor789
authored
feat: 8.2.0 (#203)
* feat: cleaned up App_Resources * chore: bump all deps * chore: set correct webpack version * chore: update gradle defaults * chore: cleanup * chore: bump webpack * chore: bump template versions to 8.2.0 * ci: update ci job
1 parent 8cf1dc2 commit d00c14d

File tree

30 files changed

+285
-242
lines changed

30 files changed

+285
-242
lines changed

‎.github/workflows/test.yml‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
- name: Install Python
4444
uses: actions/setup-python@v1
4545

46+
- uses: actions/setup-java@v2
47+
with:
48+
distribution: 'temurin'
49+
java-version: '11'
50+
4651
- name: Install Node
4752
uses: actions/setup-node@v2
4853
with:
@@ -76,10 +81,10 @@ jobs:
7681
npm install
7782
npm run prepare-templates
7883
79-
- name: "Uninstall build-tools@31.0.0"
80-
run: |
81-
SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
82-
echo y | $SDKMANAGER --uninstall "build-tools;31.0.0"
84+
# - name: "Uninstall build-tools@31.0.0"
85+
# run: |
86+
# SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
87+
# echo y | $SDKMANAGER --uninstall "build-tools;31.0.0"
8388

8489
- name: Create app from template
8590
env:
@@ -97,22 +102,22 @@ jobs:
97102
- name: Test Android Build
98103
working-directory: myApp
99104
run: |
100-
cat <<EOT > _fix_ndk_version.js
101-
const fs = require('fs');
102-
const path = require('path');
103-
104-
const appGradlePath = path.resolve(
105-
__dirname,
106-
'App_Resources/Android/app.gradle'
107-
);
108-
let contents = fs.readFileSync(appGradlePath);
109-
contents = contents.toString().replace(
110-
'defaultConfig {',
111-
'ndkVersion "22.1.7171670"\n defaultConfig {'
112-
);
113-
fs.writeFileSync(appGradlePath, contents);
114-
EOT
115-
116-
node _fix_ndk_version.js
105+
# cat <<EOT > _fix_ndk_version.js
106+
# const fs = require('fs');
107+
# const path = require('path');
108+
109+
# const appGradlePath = path.resolve(
110+
# __dirname,
111+
# 'App_Resources/Android/app.gradle'
112+
# );
113+
# let contents = fs.readFileSync(appGradlePath);
114+
# contents = contents.toString().replace(
115+
# 'defaultConfig {',
116+
# 'ndkVersion "22.1.7171670"\n defaultConfig {'
117+
# );
118+
# fs.writeFileSync(appGradlePath, contents);
119+
# EOT
120+
#
121+
# node _fix_ndk_version.js
117122
118123
ns build android

‎packages/template-blank-ng/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.1.3",
6+
"version": "8.2.0",
77
"description": "Blank template for NativeScript apps using Angular",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -39,26 +39,26 @@
3939
"url": "https://github.com/NativeScript/NativeScript/issues"
4040
},
4141
"dependencies": {
42-
"@angular/animations": "~13.1.1",
43-
"@angular/common": "~13.1.1",
44-
"@angular/compiler": "~13.1.1",
45-
"@angular/core": "~13.1.1",
46-
"@angular/forms": "~13.1.1",
47-
"@angular/platform-browser": "~13.1.1",
48-
"@angular/platform-browser-dynamic": "~13.1.1",
49-
"@angular/router": "~13.1.1",
42+
"@angular/animations": "~13.2.0",
43+
"@angular/common": "~13.2.0",
44+
"@angular/compiler": "~13.2.0",
45+
"@angular/core": "~13.2.0",
46+
"@angular/forms": "~13.2.0",
47+
"@angular/platform-browser": "~13.2.0",
48+
"@angular/platform-browser-dynamic": "~13.2.0",
49+
"@angular/router": "~13.2.0",
5050
"@nativescript/angular": "^13.0.0",
51-
"@nativescript/core": "~8.1.1",
52-
"@nativescript/theme": "~3.0.1",
53-
"rxjs": "~7.4.0",
54-
"zone.js": "~0.11.4"
51+
"@nativescript/core": "~8.2.0",
52+
"@nativescript/theme": "~3.0.2",
53+
"rxjs": "~7.5.0",
54+
"zone.js": "~0.11.5"
5555
},
5656
"devDependencies": {
57-
"@angular-devkit/build-angular": "~13.1.1",
58-
"@angular/compiler-cli": "~13.1.1",
59-
"@nativescript/types": "~8.1.1",
60-
"@nativescript/webpack": "~5.0.0",
61-
"@ngtools/webpack": "~13.1.1",
62-
"typescript": "~4.4.4"
57+
"@angular-devkit/build-angular": "~13.2.0",
58+
"@angular/compiler-cli": "~13.2.0",
59+
"@nativescript/types": "~8.2.0",
60+
"@nativescript/webpack": "~5.0.6",
61+
"@ngtools/webpack": "~13.2.0",
62+
"typescript": "~4.5.5"
6363
}
6464
}

‎packages/template-blank-react/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/template-blank-react",
3-
"version": "8.1.2",
3+
"version": "8.2.0",
44
"description": "Blank template for NativeScript apps using React.",
55
"author": "Jamie Birch <14055146+shirakaba@users.noreply.github.com>",
66
"main": "src/app.ts",
@@ -41,18 +41,18 @@
4141
"template"
4242
],
4343
"dependencies": {
44-
"@nativescript/core": "~8.1.1",
44+
"@nativescript/core": "~8.2.0",
4545
"@react-navigation/core": "^5.15.3",
4646
"react": "~16.13.1",
4747
"react-nativescript": "^3.0.0-beta.1",
4848
"react-nativescript-navigation": "3.0.0-beta.2"
4949
},
5050
"devDependencies": {
51-
"@nativescript/types": "~8.1.1",
52-
"@nativescript/webpack": "~5.0.0",
51+
"@nativescript/types": "~8.2.0",
52+
"@nativescript/webpack": "~5.0.6",
5353
"@types/react": "16.9.34",
54-
"patch-package": "~6.2.2",
55-
"typescript": "~4.3.5"
54+
"patch-package": "~6.4.7",
55+
"typescript": "~4.5.5"
5656
},
5757
"gitHead": "1350d382fb4b0ed4c6e9685df909518b2688e004",
5858
"readme": "NativeScript Application"

‎packages/template-blank-svelte/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.ts",
44
"displayName": "Blank Svelte",
55
"templateType": "App template",
6-
"version": "8.1.2",
6+
"version": "8.2.0",
77
"description": "Blank template for NativeScript apps using Svelte",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -41,17 +41,17 @@
4141
"url": "https://github.com/NativeScript/NativeScript/issues"
4242
},
4343
"dependencies": {
44-
"@nativescript/core": "~8.1.1",
45-
"@nativescript/theme": "~3.0.1",
44+
"@nativescript/core": "~8.2.0",
45+
"@nativescript/theme": "~3.0.2",
4646
"svelte-native": "~1.0.0"
4747
},
4848
"devDependencies": {
49-
"@nativescript/types": "~8.1.1",
50-
"@nativescript/webpack": "~5.0.0",
49+
"@nativescript/types": "~8.2.0",
50+
"@nativescript/webpack": "~5.0.6",
5151
"svelte": "~3.44.0",
5252
"svelte-loader": "^3.1.2",
5353
"svelte-native-preprocessor": "^1.0.0",
5454
"svelte-preprocess": "^4.7.0",
55-
"typescript": "~4.3.5"
55+
"typescript": "~4.5.5"
5656
}
5757
}

‎packages/template-blank-ts/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.ts",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.1.1",
6+
"version": "8.2.0",
77
"description": "Blank template for Vanilla NativeScript apps using TypeScript",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -38,12 +38,12 @@
3838
"url": "https://github.com/NativeScript/NativeScript/issues"
3939
},
4040
"dependencies": {
41-
"@nativescript/core": "~8.1.1",
42-
"@nativescript/theme": "~3.0.1"
41+
"@nativescript/core": "~8.2.0",
42+
"@nativescript/theme": "~3.0.2"
4343
},
4444
"devDependencies": {
45-
"@nativescript/types": "~8.1.1",
46-
"@nativescript/webpack": "~5.0.0",
47-
"typescript": "~4.3.5"
45+
"@nativescript/types": "~8.2.0",
46+
"@nativescript/webpack": "~5.0.6",
47+
"typescript": "~4.5.5"
4848
}
4949
}

‎packages/template-blank-vue-ts/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nativescript/template-blank-vue-ts",
33
"main": "app/app.ts",
44
"displayName": "Blank Vue Typescript",
5-
"version": "8.1.1",
5+
"version": "8.2.0",
66
"description": "Blank Typescript template for NativeScript apps using Vue.",
77
"author": "NativeScript Team <oss@nativescript.org>",
88
"license": "Apache-2.0",
@@ -41,16 +41,16 @@
4141
"category-general"
4242
],
4343
"dependencies": {
44-
"@nativescript/core": "~8.1.1",
45-
"@nativescript/theme": "~3.0.1",
44+
"@nativescript/core": "~8.2.0",
45+
"@nativescript/theme": "~3.0.2",
4646
"nativescript-vue": "~2.9.0"
4747
},
4848
"devDependencies": {
49-
"@nativescript/types": "~8.1.1",
50-
"@nativescript/webpack": "~5.0.0",
51-
"@types/node": "~14.6.2",
49+
"@nativescript/types": "~8.2.0",
50+
"@nativescript/webpack": "~5.0.6",
51+
"@types/node": "~17.0.21",
5252
"nativescript-vue-template-compiler": "~2.9.0",
53-
"typescript": "~4.3.5",
53+
"typescript": "~4.5.5",
5454
"vue": "~2.6.12"
5555
}
5656
}

‎packages/template-blank-vue/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nativescript/template-blank-vue",
33
"main": "app/app.js",
44
"displayName": "Blank",
5-
"version": "8.1.1",
5+
"version": "8.2.0",
66
"description": "Blank template for NativeScript apps using Vue.",
77
"author": "NativeScript Team <oss@nativescript.org>",
88
"license": "Apache-2.0",
@@ -40,12 +40,12 @@
4040
"category-general"
4141
],
4242
"dependencies": {
43-
"@nativescript/core": "~8.1.1",
44-
"@nativescript/theme": "~3.0.1",
43+
"@nativescript/core": "~8.2.0",
44+
"@nativescript/theme": "~3.0.2",
4545
"nativescript-vue": "~2.9.0"
4646
},
4747
"devDependencies": {
48-
"@nativescript/webpack": "~5.0.0",
48+
"@nativescript/webpack": "~5.0.6",
4949
"nativescript-vue-template-compiler": "~2.9.0"
5050
}
5151
}

‎packages/template-blank/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "app/app.js",
44
"displayName": "Blank",
55
"templateType": "App template",
6-
"version": "8.1.1",
6+
"version": "8.2.0",
77
"description": "Blank template for Vanilla NativeScript apps using JavaScript",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -38,10 +38,10 @@
3838
"url": "https://github.com/NativeScript/NativeScript/issues"
3939
},
4040
"dependencies": {
41-
"@nativescript/core": "~8.1.1",
42-
"@nativescript/theme": "~3.0.1"
41+
"@nativescript/core": "~8.2.0",
42+
"@nativescript/theme": "~3.0.2"
4343
},
4444
"devDependencies": {
45-
"@nativescript/webpack": "~5.0.0"
45+
"@nativescript/webpack": "~5.0.6"
4646
}
4747
}

‎packages/template-drawer-navigation-ng/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Navigation Drawer",
55
"templateType": "App template",
6-
"version": "8.1.3",
6+
"version": "8.2.0",
77
"description": "Side navigation template",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -41,27 +41,27 @@
4141
"url": "https://github.com/NativeScript/NativeScript/issues"
4242
},
4343
"dependencies": {
44-
"@angular/animations": "~13.1.1",
45-
"@angular/common": "~13.1.1",
46-
"@angular/compiler": "~13.1.1",
47-
"@angular/core": "~13.1.1",
48-
"@angular/forms": "~13.1.1",
49-
"@angular/platform-browser": "~13.1.1",
50-
"@angular/platform-browser-dynamic": "~13.1.1",
51-
"@angular/router": "~13.1.1",
44+
"@angular/animations": "~13.2.0",
45+
"@angular/common": "~13.2.0",
46+
"@angular/compiler": "~13.2.0",
47+
"@angular/core": "~13.2.0",
48+
"@angular/forms": "~13.2.0",
49+
"@angular/platform-browser": "~13.2.0",
50+
"@angular/platform-browser-dynamic": "~13.2.0",
51+
"@angular/router": "~13.2.0",
5252
"@nativescript/angular": "^13.0.0",
53-
"@nativescript/core": "~8.1.1",
54-
"@nativescript/theme": "~3.0.1",
55-
"nativescript-ui-sidedrawer": "~10.0.1",
56-
"rxjs": "~7.4.0",
57-
"zone.js": "~0.11.4"
53+
"@nativescript/core": "~8.2.0",
54+
"@nativescript/theme": "~3.0.2",
55+
"nativescript-ui-sidedrawer": "~10.0.2",
56+
"rxjs": "~7.5.0",
57+
"zone.js": "~0.11.5"
5858
},
5959
"devDependencies": {
60-
"@angular-devkit/build-angular": "~13.1.1",
61-
"@angular/compiler-cli": "~13.1.1",
62-
"@nativescript/types": "~8.1.1",
63-
"@nativescript/webpack": "~5.0.0",
64-
"@ngtools/webpack": "~13.1.1",
65-
"typescript": "~4.4.4"
60+
"@angular-devkit/build-angular": "~13.2.0",
61+
"@angular/compiler-cli": "~13.2.0",
62+
"@nativescript/types": "~8.2.0",
63+
"@nativescript/webpack": "~5.0.6",
64+
"@ngtools/webpack": "~13.2.0",
65+
"typescript": "~4.5.5"
6666
}
6767
}

‎packages/template-drawer-navigation-ts/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "src/main.ts",
44
"displayName": "Navigation Drawer",
55
"templateType": "App template",
6-
"version": "8.1.1",
6+
"version": "8.2.0",
77
"description": "Side navigation template",
88
"author": "NativeScript Team <oss@nativescript.org>",
99
"license": "Apache-2.0",
@@ -40,14 +40,14 @@
4040
"url": "https://github.com/NativeScript/NativeScript/issues"
4141
},
4242
"dependencies": {
43-
"@nativescript/core": "~8.1.1",
44-
"@nativescript/theme": "~3.0.1",
45-
"nativescript-ui-sidedrawer": "~10.0.1",
46-
"rxjs": "~7.4.0"
43+
"@nativescript/core": "~8.2.0",
44+
"@nativescript/theme": "~3.0.2",
45+
"nativescript-ui-sidedrawer": "~10.0.2",
46+
"rxjs": "~7.5.0"
4747
},
4848
"devDependencies": {
49-
"@nativescript/types": "~8.1.1",
50-
"@nativescript/webpack": "~5.0.0",
51-
"typescript": "~4.3.5"
49+
"@nativescript/types": "~8.2.0",
50+
"@nativescript/webpack": "~5.0.6",
51+
"typescript": "~4.5.5"
5252
}
5353
}

0 commit comments

Comments
 (0)