Skip to content

Commit

Permalink
Merge branch 'master' into TIMOB-28406
Browse files Browse the repository at this point in the history
  • Loading branch information
garymathews committed Mar 31, 2021
2 parents 16145dc + 580cffc commit 77d98fb
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 67 deletions.
Binary file modified android/titanium/lib/aps-analytics.jar
Binary file not shown.
24 changes: 24 additions & 0 deletions apidoc/Titanium/UI/TabGroup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,15 @@ methods:
platforms: [android]
since: 3.6.0

- name: getActiveTab
summary: Gets the currently-active tab.
returns:
type: Titanium.UI.Tab
deprecated:
since: "10.0.0"
removed: "10.0.0"
notes: Use the <Titanium.UI.TabGroup.activeTab> property instead.

- name: open
summary: Opens the tab group and makes it visible.

Expand All @@ -263,10 +272,25 @@ methods:
summary: Tab to remove.
type: Titanium.UI.Tab

- name: setActiveTab
summary: Selects the currently active tab in a tab group.
parameters:
- name: indexOrObject
summary: Index or object of the tab to switch to.
type: [Number, Titanium.UI.Tab]
deprecated:
since: "10.0.0"
removed: "10.0.0"
notes: Use the <Titanium.UI.TabGroup.activeTab> property instead.

- name: getTabs
summary: Gets all tabs that are managed by the tab group.
returns:
type: Array<Titanium.UI.Tab>
deprecated:
since: "10.0.0"
removed: "10.0.0"
notes: Use the <Titanium.UI.TabGroup.tabs> property instead.

properties:
- name: activeTab
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libAPSAnalytics.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -19,38 +19,38 @@
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>maccatalyst</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libAPSAnalytics.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libAPSAnalytics.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
104 changes: 50 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,36 +117,36 @@
"@commitlint/cli": "^12.0.1",
"@commitlint/config-conventional": "^12.0.1",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-node-resolve": "^11.2.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-node-resolve": "^11.2.1",
"@seadub/clang-format-lint": "0.0.2",
"@seadub/danger-plugin-dependencies": "1.0.0",
"@seadub/danger-plugin-eslint": "^2.0.0",
"@seadub/danger-plugin-junit": "0.2.0",
"babel-plugin-transform-titanium": "^0.1.1",
"chai": "^4.3.4",
"clang-format": "1.5.0",
"commander": "^7.1.0",
"commander": "^7.2.0",
"commitizen": "^4.2.3",
"conventional-changelog-cli": "^2.1.1",
"core-js": "^3.9.1",
"cz-conventional-changelog": "^3.3.0",
"danger": "^10.6.4",
"dateformat": "^4.5.1",
"eslint": "^7.22.0",
"eslint": "^7.23.0",
"eslint-config-axway": "^6.0.1",
"eslint-plugin-mocha": "^8.1.0",
"folder-hash": "^4.0.1",
"glob": "^7.1.6",
"husky": "^5.2.0",
"husky": "^6.0.0",
"lint-staged": "^10.5.4",
"lockfile-lint": "^4.6.2",
"mocha": "^8.3.2",
"mocha-jenkins-reporter": "^0.4.5",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"request-promise-native": "^1.0.9",
"rollup": "^2.42.4",
"rollup": "^2.44.0",
"ssri": "^8.0.1",
"stream-splitter": "^0.3.2",
"strip-ansi": "^6.0.0",
Expand Down

0 comments on commit 77d98fb

Please sign in to comment.