Skip to content

Commit 2693d9d

Browse files
committed
fix: SDK updates and build config fixes
1 parent aa18eb9 commit 2693d9d

File tree

12 files changed

+24
-100
lines changed

12 files changed

+24
-100
lines changed

src/package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
},
1717
"scripts": {
1818
"tsc": "npm i && tsc",
19-
"build": "npm run tsc && npm run build.native",
20-
"build.native": "node scripts/build-native.js",
19+
"build": "npm i && npx ts-patch install && tsc",
2120
"postclone": "npm i && node scripts/postclone.js",
2221
"tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\"",
2322
"ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**'",
24-
"prepack": "npm run build.native",
23+
"prepack": "npm run build",
2524
"demo.ios": "npm run tsc && cd ../demo-angular && tns run ios --no-hmr",
2625
"demo.android": "npm run tsc && cd ../demo-angular && tns run android --no-hmr",
2726
"demo.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
@@ -46,13 +45,12 @@
4645
"homepage": "https://github.com/dotnetdreamer/nativescript-http-formdata",
4746
"readmeFilename": "README.md",
4847
"devDependencies": {
49-
"@nativescript/core": "8.0.0",
50-
"@nativescript/types": "8.0.0",
51-
"prompt": "^1.1.0",
52-
"rimraf": "^3.0.2",
53-
"semver": "^7.3.5",
54-
"tslint": "^5.12.1",
55-
"typescript": "~4.0.0"
48+
"@nativescript/core": "~8.2.0",
49+
"@nativescript/types": "~8.2.0",
50+
"@nativescript/webpack": "~5.0.0",
51+
"rimraf": "^3.0.2",
52+
"ts-patch": "~1.4.5",
53+
"typescript": "~4.3.5"
5654
},
5755
"bootstrapper": "nativescript-plugin-seed"
5856
}

src/platforms/android/AndroidManifest.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/platforms/android/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/platforms/android/include.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/* Include.gradle configuration: http://docs.nativescript.org/plugins/plugins#includegradle-specification */
2-
3-
// android {
4-
// mavenCentral()
5-
// }
6-
7-
81
repositories {
92
mavenCentral()
103
maven {
@@ -16,5 +9,5 @@ dependencies {
169
// Describe plugin native Android dependencies like
1710
// implementation "groupName:pluginName:ver"
1811
// EXAMPLE: implementation "com.facebook.fresco:fresco:0.9.0+"
19-
compile "com.squareup.okhttp3:okhttp:4.3.1"
12+
implementation "com.squareup.okhttp3:okhttp:4.9.3"
2013
}
Binary file not shown.

src/platforms/ios/Info.plist

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/platforms/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pod 'OMGHTTPURLRQ', '~> 3.2.4'
1+
pod 'OMGHTTPURLRQ', '~> 3.3.0'

src/platforms/ios/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/platforms/ios/build.xcconfig

Whitespace-only changes.

src/references.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/// <reference path="./node_modules/@nativescript/types-ios/index.d.ts" />
2-
/// <reference path="./node_modules/@nativescript/types-android/index.d.ts" />
2+
/// <reference path="./node_modules/@nativescript/types-android/lib/android-29.d.ts" />
33
/// <reference path="./typings/objc!OMGHTTPURLRQ.d.ts" />

src/scripts/build-native.js

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/tsconfig.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"compilerOptions": {
3-
"target": "es5",
4-
"module": "commonjs",
3+
"target": "ES2017",
4+
"module": "esnext",
5+
"moduleResolution": "node",
56
"declaration": true,
67
"removeComments": true,
78
"noLib": false,
89
"emitDecoratorMetadata": true,
910
"experimentalDecorators": true,
1011
"skipLibCheck": true,
11-
"lib": ["es6", "dom"],
12+
"lib": ["es2017", "dom"],
1213
"sourceMap": true,
1314
"pretty": true,
1415
"allowUnreachableCode": false,
@@ -18,12 +19,17 @@
1819
"noImplicitAny": false,
1920
"noImplicitReturns": true,
2021
"noImplicitUseStrict": false,
21-
"noFallthroughCasesInSwitch": true
22+
"noFallthroughCasesInSwitch": true,
23+
"baseUrl": ".",
24+
"plugins": [
25+
{
26+
"transform": "@nativescript/webpack/dist/transformers/NativeClass",
27+
"type": "raw"
28+
}
29+
]
2230
},
2331
"exclude": [
2432
"node_modules"
2533
],
26-
"include": ["*.ios.ts", "*.android.ts"],
27-
"files": ["./references.d.ts"],
2834
"compileOnSave": false
29-
}
35+
}

0 commit comments

Comments
 (0)