fix: SDK updates and build config fixes

dotnetdreamer · Apr 24, 2022 · 2693d9d · 2693d9d
1 parent aa18eb9
commit 2693d9d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 100 deletions.
diff --git a/src/package.json b/src/package.json
@@ -16,12 +16,11 @@
 	},
 	"scripts": {
 		"tsc": "npm i && tsc",
-		"build": "npm run tsc && npm run build.native",
-		"build.native": "node scripts/build-native.js",
+		"build": "npm i && npx ts-patch install && tsc",
 		"postclone": "npm i && node scripts/postclone.js",
 		"tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\"",
 		"ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**'",
-		"prepack": "npm run build.native",
+		"prepack": "npm run build",
 		"demo.ios": "npm run tsc && cd ../demo-angular && tns run ios --no-hmr",
 		"demo.android": "npm run tsc && cd ../demo-angular && tns run android --no-hmr",
 		"demo.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
@@ -46,13 +45,12 @@
 	"homepage": "https://github.com/dotnetdreamer/nativescript-http-formdata",
 	"readmeFilename": "README.md",
 	"devDependencies": {
-		"@nativescript/core": "8.0.0",
-		"@nativescript/types": "8.0.0",
-		"prompt": "^1.1.0",
-		"rimraf": "^3.0.2",
-		"semver": "^7.3.5",
-		"tslint": "^5.12.1",
-		"typescript": "~4.0.0"
+		"@nativescript/core": "~8.2.0",
+        "@nativescript/types": "~8.2.0",
+        "@nativescript/webpack": "~5.0.0",
+        "rimraf": "^3.0.2",
+        "ts-patch": "~1.4.5",
+        "typescript": "~4.3.5"
 	},
 	"bootstrapper": "nativescript-plugin-seed"
 }
diff --git a/src/platforms/android/AndroidManifest.xml b/src/platforms/android/AndroidManifest.xml
diff --git a/src/platforms/android/README.md b/src/platforms/android/README.md
diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle
@@ -1,10 +1,3 @@
-/* Include.gradle configuration: http://docs.nativescript.org/plugins/plugins#includegradle-specification */
-
-// android {
-// 	mavenCentral()
-// }
-
-
 repositories {
     mavenCentral()
     maven {
@@ -16,5 +9,5 @@ dependencies {
     // Describe plugin native Android dependencies like
 	// implementation "groupName:pluginName:ver" 
     // EXAMPLE: implementation "com.facebook.fresco:fresco:0.9.0+"
-    compile "com.squareup.okhttp3:okhttp:4.3.1"
+    implementation "com.squareup.okhttp3:okhttp:4.9.3"
 }
diff --git a/src/platforms/android/nativescript_http_formdata.aar b/src/platforms/android/nativescript_http_formdata.aar
diff --git a/src/platforms/ios/Info.plist b/src/platforms/ios/Info.plist
diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
@@ -1 +1 @@
-pod 'OMGHTTPURLRQ', '~> 3.2.4'
+pod 'OMGHTTPURLRQ', '~> 3.3.0'
diff --git a/src/platforms/ios/README.md b/src/platforms/ios/README.md
diff --git a/src/platforms/ios/build.xcconfig b/src/platforms/ios/build.xcconfig
diff --git a/src/references.d.ts b/src/references.d.ts
@@ -1,3 +1,3 @@
 /// <reference path="./node_modules/@nativescript/types-ios/index.d.ts" />
-/// <reference path="./node_modules/@nativescript/types-android/index.d.ts" />
+/// <reference path="./node_modules/@nativescript/types-android/lib/android-29.d.ts" />
 /// <reference path="./typings/objc!OMGHTTPURLRQ.d.ts" />
diff --git a/src/scripts/build-native.js b/src/scripts/build-native.js
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -1,14 +1,15 @@
 {
     "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
+        "target": "ES2017",
+        "module": "esnext",
+        "moduleResolution": "node",
         "declaration": true,
         "removeComments": true,
         "noLib": false,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "skipLibCheck": true,
-        "lib": ["es6", "dom"],
+        "lib": ["es2017", "dom"],
         "sourceMap": true,
         "pretty": true,
         "allowUnreachableCode": false,
@@ -18,12 +19,17 @@
         "noImplicitAny": false,
         "noImplicitReturns": true,
         "noImplicitUseStrict": false,
-        "noFallthroughCasesInSwitch": true
+        "noFallthroughCasesInSwitch": true,
+        "baseUrl": ".",
+    		"plugins": [
+    			{
+    				"transform": "@nativescript/webpack/dist/transformers/NativeClass",
+    				"type": "raw"
+    			}
+    		]
     },
     "exclude": [
         "node_modules"
     ],
-    "include": ["*.ios.ts", "*.android.ts"],
-    "files": ["./references.d.ts"],
     "compileOnSave": false
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pod 'OMGHTTPURLRQ', '~> 3.2.4'
		pod 'OMGHTTPURLRQ', '~> 3.3.0'