[Capacitor 3] complete migration to Capacitor 3 (#128)

NLueg · web-flow · commit 45c15f512b20 · 2021-07-10T22:51:20.000+05:30
* feature: migrate success/error to resolve/reject

* feature: migrate android-plugin

* feature: bump deployment target to 12.0

* feature: migrate callback
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,17 +4,17 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,7 +40,8 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.google.android.gms:play-services-auth:18.+'
diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
@@ -1,13 +1,15 @@
 package com.codetrixstudio.capacitor.GoogleAuth;
 
 import android.content.Intent;
+import androidx.activity.result.ActivityResult;
 
 import com.codetrixstudio.capacitor.GoogleAuth.capacitorgoogleauth.R;
 import com.getcapacitor.JSObject;
-import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.ActivityCallback;
+import com.getcapacitor.annotation.CapacitorPlugin;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -19,9 +21,8 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 
-@NativePlugin(requestCodes = GoogleAuth.RC_SIGN_IN)
+@CapacitorPlugin()
 public class GoogleAuth extends Plugin {
-  static final int RC_SIGN_IN = 1337;
   private GoogleSignInClient googleSignInClient;
 
   @Override
@@ -62,23 +63,14 @@ public void load() {
   public void signIn(PluginCall call) {
     saveCall(call);
     Intent signInIntent = googleSignInClient.getSignInIntent();
-    startActivityForResult(call, signInIntent, RC_SIGN_IN);
+    startActivityForResult(call, signInIntent, "signInResult");
   }
 
-  @Override
-  protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
-    super.handleOnActivityResult(requestCode, resultCode, data);
-
-    if (requestCode == RC_SIGN_IN) {
-      Task<GoogleSignInAccount> task = GoogleSignIn.getSignedInAccountFromIntent(data);
-      handleSignInResult(task);
-    }
-  }
+  @ActivityCallback
+  protected void signInResult(PluginCall call, ActivityResult result) {
+    if (call == null) return;
 
-  private void handleSignInResult(Task<GoogleSignInAccount> completedTask) {
-    PluginCall signInCall = getSavedCall();
-
-    if (signInCall == null) return;
+    Task<GoogleSignInAccount> completedTask = GoogleSignIn.getSignedInAccountFromIntent(result.getData());
 
     try {
       GoogleSignInAccount account = completedTask.getResult(ApiException.class);
@@ -90,29 +82,28 @@ private void handleSignInResult(Task<GoogleSignInAccount> completedTask) {
       user.put("serverAuthCode", account.getServerAuthCode());
       user.put("idToken", account.getIdToken());
       user.put("authentication", authentication);
-      
+
       user.put("displayName", account.getDisplayName());
       user.put("email", account.getEmail());
       user.put("familyName", account.getFamilyName());
       user.put("givenName", account.getGivenName());
       user.put("id", account.getId());
       user.put("imageUrl", account.getPhotoUrl());
 
-      signInCall.success(user);
-
+      call.resolve(user);
     } catch (ApiException e) {
-      signInCall.error("Something went wrong", e);
+      call.reject("Something went wrong", e);
     }
   }
 
   @PluginMethod()
   public void refresh(final PluginCall call) {
-    call.error("I don't know how to refresh token on Android");
+    call.reject("I don't know how to refresh token on Android");
   }
 
   @PluginMethod()
   public void signOut(final PluginCall call) {
     googleSignInClient.signOut();
-    call.success();
+    call.resolve();
   }
 }
diff --git a/ios/Plugin.xcodeproj/project.pbxproj b/ios/Plugin.xcodeproj/project.pbxproj
@@ -422,7 +422,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -476,7 +476,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -499,7 +499,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
@@ -524,7 +524,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift
@@ -50,20 +50,20 @@ public class GoogleAuth: CAPPlugin {
     func refresh(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
             if self.googleSignIn.currentUser == nil {
-                call.error("User not logged in.");
+                call.reject("User not logged in.");
                 return
             }
             self.googleSignIn.currentUser.authentication.getTokensWithHandler { (authentication, error) in
                 guard let authentication = authentication else {
-                    call.error(error?.localizedDescription ?? "Something went wrong.");
+                    call.reject(error?.localizedDescription ?? "Something went wrong.");
                     return;
                 }
                 let authenticationData: [String: Any] = [
                     "accessToken": authentication.accessToken,
                     "idToken": authentication.idToken,
                     "refreshToken": authentication.refreshToken
                 ]
-                call.success(authenticationData);
+                call.resolve(authenticationData);
             }
         }
     }
@@ -73,7 +73,7 @@ public class GoogleAuth: CAPPlugin {
         DispatchQueue.main.async {
             self.googleSignIn.signOut();
         }
-        call.success();
+        call.resolve();
     }
 
     @objc
@@ -106,14 +106,14 @@ public class GoogleAuth: CAPPlugin {
         if let imageUrl = user.profile.imageURL(withDimension: 100)?.absoluteString {
             userData["imageUrl"] = imageUrl;
         }
-        signInCall?.success(userData);
+        signInCall?.resolve(userData);
     }
 }
 
 extension GoogleAuth: GIDSignInDelegate {
     public func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error!) {
         if let error = error {
-            signInCall?.error(error.localizedDescription);
+            signInCall?.reject(error.localizedDescription);
             return;
         }
         processCallback(user: user);
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,4 +1,4 @@
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 target 'Plugin' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,7 +5,7 @@
     "experimentalDecorators": true,
     "lib": [
       "dom",
-      "es2015"
+      "es2017"
     ],
     "module": "ESNext",
     "moduleResolution": "node",

Original file line number	Diff line number	Diff line change
`@@ -50,20 +50,20 @@ public class GoogleAuth: CAPPlugin {`
`50`	`50`	`func refresh(_ call: CAPPluginCall) {`
`51`	`51`	`DispatchQueue.main.async {`
`52`	`52`	`if self.googleSignIn.currentUser == nil {`
`53`		`- call.error("User not logged in.");`
	`53`	`+ call.reject("User not logged in.");`
`54`	`54`	`return`
`55`	`55`	`}`
`56`	`56`	`self.googleSignIn.currentUser.authentication.getTokensWithHandler { (authentication, error) in`
`57`	`57`	`guard let authentication = authentication else {`
`58`		`- call.error(error?.localizedDescription ?? "Something went wrong.");`
	`58`	`+ call.reject(error?.localizedDescription ?? "Something went wrong.");`
`59`	`59`	`return;`
`60`	`60`	`}`
`61`	`61`	`let authenticationData: [String: Any] = [`
`62`	`62`	`"accessToken": authentication.accessToken,`
`63`	`63`	`"idToken": authentication.idToken,`
`64`	`64`	`"refreshToken": authentication.refreshToken`
`65`	`65`	`]`
`66`		`- call.success(authenticationData);`
	`66`	`+ call.resolve(authenticationData);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -73,7 +73,7 @@ public class GoogleAuth: CAPPlugin {`
`73`	`73`	`DispatchQueue.main.async {`
`74`	`74`	`self.googleSignIn.signOut();`
`75`	`75`	`}`
`76`		`- call.success();`
	`76`	`+ call.resolve();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@objc`
`@@ -106,14 +106,14 @@ public class GoogleAuth: CAPPlugin {`
`106`	`106`	`if let imageUrl = user.profile.imageURL(withDimension: 100)?.absoluteString {`
`107`	`107`	`userData["imageUrl"] = imageUrl;`
`108`	`108`	`}`
`109`		`- signInCall?.success(userData);`
	`109`	`+ signInCall?.resolve(userData);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`extension GoogleAuth: GIDSignInDelegate {`
`114`	`114`	`public func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error!) {`
`115`	`115`	`if let error = error {`
`116`		`- signInCall?.error(error.localizedDescription);`
	`116`	`+ signInCall?.reject(error.localizedDescription);`
`117`	`117`	`return;`
`118`	`118`	`}`
`119`	`119`	`processCallback(user: user);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-platform :ios, '11.0'`
	`1`	`+platform :ios, '12.0'`
`2`	`2`
`3`	`3`	`target 'Plugin' do`
`4`	`4`	`# Comment the next line if you're not using Swift and don't want to use dynamic frameworks`