Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into feat/mmkv
  • Loading branch information
NathanWalker authored Sep 19, 2022
commit a3100204a79d8cb262014d73159064774769a118
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@nativescript/zip": "file:../../packages/zip"
},
"devDependencies": {
"@nativescript/android": "file:../../../../android-runtime/dist/nativescript-android.tgz",
"@nativescript/ios": "~8.2.0"
"@nativescript/android": "~8.3.0",
"@nativescript/ios": "~8.3.0"
}
}
7 changes: 3 additions & 4 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,16 @@
"@nativescript/local-notifications": ["packages/local-notifications/index.d.ts"],
"@nativescript/localize": ["packages/localize/index.d.ts"],
"@nativescript/localize/angular": ["packages/localize/angular/index.ts"],
"@nativescript/mmkv": ["packages/mmkv/index.d.ts"],
"@nativescript/mmkv-metal": ["packages/mmkv-metal/index.d.ts"],
"@nativescript/pdf": ["packages/pdf/index.d.ts"],
"@nativescript/picker": ["packages/picker/index.d.ts"],
"@nativescript/picker/angular": ["packages/picker/angular/index.ts"],
"@nativescript/shared-notification-delegate": ["packages/shared-notification-delegate/index.d.ts"],
"@nativescript/social-share": ["packages/social-share/index.d.ts"],
"@nativescript/theme-switcher": ["packages/theme-switcher/index.ts"],
"@nativescript/twitter": ["packages/twitter/index.d.ts"],
"@nativescript/zip": ["packages/zip/index.d.ts"],
"@nativescript/mmkv": ["packages/mmkv/index.d.ts"],
"@nativescript/mmkv-metal": ["packages/mmkv-metal/index.d.ts"],
"@nativescript/haptics": ["packages/haptics/index.d.ts"]
"@nativescript/zip": ["packages/zip/index.d.ts"]
}
},
"exclude": ["node_modules", "tmp"]
Expand Down
10 changes: 5 additions & 5 deletions workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
"iqkeyboardmanager": "packages/iqkeyboardmanager",
"local-notifications": "packages/local-notifications",
"localize": "packages/localize",
"mmkv": "packages/mmkv",
"mmkv-metal": "packages/mmkv-metal",
"pdf": "packages/pdf",
"picker": "packages/picker",
"shared-notification-delegate": "packages/shared-notification-delegate",
"social-share": "packages/social-share",
"theme-switcher": "packages/theme-switcher",
"twitter": "packages/twitter",
"zip": "packages/zip",
"mmkv": "packages/mmkv",
"mmkv-metal": "packages/mmkv-metal",
"haptics": "packages/haptics"
}
"zip": "packages/zip"
},
"$schema": "./node_modules/nx/schemas/workspace-schema.json"
}
You are viewing a condensed version of this merge commit. You can view the full changes here.