Skip to content

Commit 1b5ef97

Browse files
Merge pull request #52 from EddyVerbruggen/master
Bump IQKeyboardManager Pod to 6.2.0, and NativeScript to 5.1.x
2 parents 7f3ea8c + 24c62ad commit 1b5ef97

6 files changed

Lines changed: 30 additions & 18 deletions

File tree

demo/app/app.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import * as application from "tns-core-modules/application";
2-
application.start({ moduleName: "main-page" });
2+
3+
application.run({moduleName: "main-page"});

demo/app/main-page.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:IQKeyboardManager="nativescript-iqkeyboardmanager" loaded="pageLoaded">
2+
<ActionBar title="IQKeyboard Manager demo"/>
23
<ScrollView>
34
<StackLayout>
45

demo/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
"nativescript": {
33
"id": "org.nativescript.iqkeyboardmanagerdemo",
44
"tns-ios": {
5-
"version": "3.4.0"
5+
"version": "5.1.0"
66
},
77
"tns-android": {
8-
"version": "3.4.1"
8+
"version": "5.1.0"
99
}
1010
},
1111
"dependencies": {
1212
"nativescript-iqkeyboardmanager": "../src",
13-
"tns-core-modules": "~3.4.0"
13+
"tns-core-modules": "~5.1.2"
1414
},
1515
"devDependencies": {
1616
"babel-traverse": "6.26.0",
1717
"babel-types": "6.26.0",
1818
"babylon": "6.18.0",
1919
"lazy": "1.0.11",
20-
"nativescript-dev-typescript": "^0.6.0",
21-
"tns-platform-declarations": "~3.4.1",
22-
"typescript": "~2.6.0"
20+
"nativescript-dev-typescript": "~0.7.9",
21+
"tns-platform-declarations": "~5.1.2",
22+
"typescript": "~3.1.0"
2323
}
2424
}

demo/tsconfig.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,21 @@
2525
"./node_modules/@types",
2626
"./node_modules"
2727
],
28-
"types": []
28+
"types": [],
29+
"baseUrl": ".",
30+
"paths": {
31+
"*": [
32+
"./node_modules/tns-core-modules/*",
33+
"./node_modules/*"
34+
],
35+
"~/*": [
36+
"app/*"
37+
]
38+
}
2939
},
3040
"exclude": [
3141
"node_modules",
3242
"platforms"
3343
],
3444
"compileOnSave": false
35-
}
45+
}

src/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-iqkeyboardmanager",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "NativeScript wrapper of the popular IQKeyboardManager iOS library",
55
"main": "iqkeyboardmanager",
66
"typings": "index.d.ts",
@@ -12,9 +12,9 @@
1212
},
1313
"scripts": {
1414
"build": "npm i && tsc",
15-
"demo.ios": "cd ../demo && tns run ios --emulator --syncAllFiles",
16-
"demo.ios.device": "cd ../demo && tns run ios --syncAllFiles",
17-
"demo.android": "cd ../demo && tns run android --syncAllFiles",
15+
"demo.ios": "npm run build && cd ../demo && tns run ios --emulator --syncAllFiles",
16+
"demo.ios.device": "npm run build && cd ../demo && tns run ios --syncAllFiles",
17+
"demo.android": "npm run build && cd ../demo && tns run android --syncAllFiles",
1818
"setup": "npm run build && cd ../demo && npm i",
1919
"setupandinstall": "npm i && cd ../demo && npm i && cd ../src && npm run build && cd ../demo && tns plugin add ../src && cd ../src",
2020
"tslint": "tslint --config '../tslint.json' '*.ts' --exclude '**/node_modules/**'",
@@ -43,10 +43,10 @@
4343
"url": "https://github.com/tjvantoll/nativescript-IQKeyboardManager/issues"
4444
},
4545
"devDependencies": {
46-
"nativescript-dev-typescript": "^0.6.0",
47-
"tns-core-modules": "~3.4.0",
48-
"tns-platform-declarations": "~3.4.0",
49-
"typescript": "~2.6.0",
46+
"nativescript-dev-typescript": "~0.7.9",
47+
"tns-core-modules": "~5.1.2",
48+
"tns-platform-declarations": "~5.1.2",
49+
"typescript": "~3.1.0",
5050
"tslint": "^5.0.0"
5151
}
5252
}

src/platforms/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pod 'IQKeyboardManager', '~> 6.0.0'
1+
pod 'IQKeyboardManager', '~> 6.2.0'

0 commit comments

Comments
 (0)