Skip to content

Upgrade to Capacitor 6 #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reslear merged 2 commits into from
Apr 22, 2024
Merged

Upgrade to Capacitor 6 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fc4005
Upgrade to Capacitor 6
KerimM Apr 20, 2024
41f3dc8
chore: change version + readme
KerimM Apr 22, 2024
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
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1 align="center">CapacitorGoogleAuth</h1>
<p align="center"><strong><code>@codetrix-studio/capacitor-google-auth</code></strong></p>
<p align="center"><strong>CAPACITOR 5</strong></p>
<p align="center"><strong>CAPACITOR 6</strong></p>
<p align="center">
Capacitor plugin for Google Auth.
</p>
Expand Down Expand Up @@ -342,6 +342,8 @@ Install version 3.4.x:
npm i --save @codetrix-studio/capacitor-google-auth@^3.4
```

Follow instruction for you project [Updating to Capacitor 6](https://capacitorjs.com/docs/next/updating/6-0).

#### Migrate from 3.2.x to 3.3.x

Install version 3.3.x:
Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.google.gms:google-services:4.4.0'
}
}

apply plugin: 'com.android.library'

android {
namespace "com.codetrixstudio.capacitor.GoogleAuth.capacitorgoogleauth"
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
defaultConfig {
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions android/gradlew
View file
Open in desktop

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

10 changes: 2 additions & 8 deletions ios/Plugin/Plugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#import <Foundation/Foundation.h>
#import <Capacitor/Capacitor.h>

// Define the plugin using the CAP_PLUGIN Macro, and
// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
CAP_PLUGIN(GoogleAuth, "GoogleAuth",
CAP_PLUGIN_METHOD(signIn, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(refresh, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(signOut, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(initialize, CAPPluginReturnPromise);
)
// Define the plugin using the CAP_PLUGIN Macro
CAP_PLUGIN(GoogleAuth, "GoogleAuth")
Loading