Skip to content

Commit

Permalink
Merge branch 'main' into super-capacitor
Browse files Browse the repository at this point in the history
  • Loading branch information
trevor-lambert committed Aug 5, 2024
2 parents 6ab0ea6 + c7d2280 commit b171914
Show file tree
Hide file tree
Showing 67 changed files with 2,497 additions and 4,792 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
with:
path: ~/.npm
key: ${{ runner.OS }}-dependency-cache-${{ hashFiles('**/package.json') }}
- run: npm ci
- run: npm install
working-directory: plugin
- run: npm run build
working-directory: plugin
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ See our docs to [get started with Portals](https://ionic.io/docs/portals/getting

## Registration

The Ionic Portals libraries for [Android](https://github.com/ionic-team/ionic-portals-android) and [iOS](https://github.com/ionic-team/ionic-portals-ios) require a **free** license key to use. Once you have integrated Portals into your project, login to your ionic account to get a key. See our doc on [how to register for free and get your Portals license key](https://ionic.io/docs/portals/getting-started#signup-for-access) and refer to the [Android](https://ionic.io/docs/portals/getting-started/android) or [iOS](https://ionic.io/docs/portals/getting-started/iOS) getting started guides to see where to add your key.
The Ionic Portals library for [Android](https://github.com/ionic-team/ionic-portals-android) and [iOS](https://github.com/ionic-team/ionic-portals-ios) requires a license key to use. Once you have integrated Portals into your project, login to your ionic account to get a key. See our doc on [how to register for your Portals license key](https://ionic.io/docs/portals/getting-started#signup-for-access) and refer to the [Android](https://ionic.io/docs/portals/getting-started/android) or [iOS](https://ionic.io/docs/portals/getting-started/iOS) getting started guides to see where to add your key.

## FAQ

Expand All @@ -41,7 +41,7 @@ This repo contains the documentation and web plugin code for Portals. The [Andro

### What is the pricing for Portals use?

Businesses with more than USD $1 million in annual revenue are required to purchase a license from Ionic before using Portals in production.
[Contact our sales team](https://ionic.io/portals#sales) for more information about pricing.

### Is Portals Open Source?

Expand Down
17 changes: 9 additions & 8 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"capacitorVersion": "5.7.2",
"capacitorVersion": "6.0.0",
"iosMinVersion": "13.0",
"androidMinSdk": "22",
"rnMinVersion": "0.63.4",
"androidLiveUpdatesVersion": "0.5.0",
"rnVersion": "0.5.1",
"iosVersion": "0.10.0",
"androidVersion": "0.9.0",
"version": "0.9.0"
}
"rnMinVersion": "0.74.2",
"androidLiveUpdatesVersion": "0.5.3",
"rnVersion": "0.7.0",
"iosVersion": "0.11.0",
"androidVersion": "0.10.2",
"cliVersion": "0.3.1",
"version": "0.10.0"
}
2 changes: 2 additions & 0 deletions plugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,5 @@ captures

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

package-lock.json
Loading

0 comments on commit b171914

Please sign in to comment.