Skip to content

Commit

Permalink
feat: Capacitor v6 Update (#60)
Browse files Browse the repository at this point in the history
  • Loading branch information
carlpoole committed Apr 23, 2024
1 parent 23c886a commit 910ad51
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 25 deletions.
15 changes: 7 additions & 8 deletions IonicPortals/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ if (System.getenv("PORTALS_PUBLISH") == "true") {

android {
namespace = "io.ionic.portals"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 22
targetSdk = 33
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -45,14 +44,14 @@ android {
dependencies {
implementation(kotlin("reflect"))

api("com.capacitorjs:core:[5.5.0,5.8.0)")
compileOnly("io.ionic:liveupdates:0.5.0")
api("com.capacitorjs:core:[6.0.0,6.1.0)")
compileOnly("io.ionic:liveupdates:0.5.1")

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
implementation("androidx.core:core-ktx:1.10.0")
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.8.0")
implementation("com.google.android.material:material:1.11.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.4")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,10 @@ See our docs to [get started with Portals](https://ionic.io/docs/portals/getting

## Registration

The Ionic Portals libraries for Android and 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/how-to/get-a-product-key) 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 libraries for Android and iOS require 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/how-to/get-a-product-key) 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

### 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.

### Is Portals Open Source?

See our [license](https://github.com/ionic-team/ionic-portals/blob/main/LICENSE.md).
Expand All @@ -48,3 +44,13 @@ See our [license](https://github.com/ionic-team/ionic-portals/blob/main/LICENSE.
Ionic Portals is a solution that lets you add web-based experiences to your native mobile apps. Portals uses [Capacitor](https://capacitorjs.com) as a bridge between the native code and the web code to allow for cross-communication between the two layers. Because Portals uses Capacitor under the hood, you are able to use any existing [Capacitor Plugins](https://capacitorjs.com/docs/plugins) while continuing to use your existing native workflow.

[Ionic Framework](https://ionicframework.com/) is the open-source mobile app development framework that makes it easy to build top quality native and progressive web apps with web technologies. Your web experiences can be developed with Ionic, but it is not necessary to use Portals.

## Testing

The test projects within the repository will only work with a valid Portals key. Add the following new line to the `local.properties` file in the project root and enter your Portals key.

```
portals_key=""
```

Note: This file is in the `.gitignore` and is not committed to repos by default.
8 changes: 4 additions & 4 deletions TestApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {

android {
namespace = "io.ionic.portals.testapp"
compileSdk = 33
compileSdk = 34

buildFeatures {
buildConfig = true
Expand All @@ -18,7 +18,7 @@ android {
defaultConfig {
applicationId = "io.ionic.portals.testapp"
minSdk = 24
targetSdk = 33
targetSdk = 34
versionCode = 1
versionName = "1.0"

Expand Down Expand Up @@ -50,9 +50,9 @@ androidComponents {

dependencies {
implementation(project(":IonicPortals"))
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
Expand Down
10 changes: 5 additions & 5 deletions TestAppCompose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ androidComponents {

dependencies {
implementation(project(":IonicPortals"))
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
implementation("androidx.activity:activity-compose:1.8.0")
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
implementation(platform("androidx.compose:compose-bom:2024.04.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -77,7 +77,7 @@ dependencies {
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.espresso:espresso-web:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.04.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
}

classpath("org.jetbrains.dokka:dokka-base:1.7.20")
classpath("com.android.tools.build:gradle:8.1.1")
classpath("com.android.tools.build:gradle:8.2.0")
classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon May 08 10:58:01 CDT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {
}
plugins {
id 'org.jetbrains.kotlin.plugin.serialization' version "1.8.21"
id 'com.android.application' version '8.1.1'
id 'com.android.application' version '8.2.0'
id 'org.jetbrains.kotlin.android' version '1.8.21'
}
}
Expand Down

0 comments on commit 910ad51

Please sign in to comment.