Merge pull request #125 from Abedalkareem/feature/move_ios_macos_to_d…

…arwin

Move the iOS and macOS code to Darwin folder

games_services/shared_apple/Achievements.swift → games_services/darwin/Classes/Achievements.swift

@@ -1,4 +1,9 @@
 import GameKit
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 class Achievements: BaseGamesServices {
 
@@ -43,9 +48,11 @@ class Achievements: BaseGamesServices {
           var items = [AchievementItemData]()
           for (description, achievement) in achievementsMap {
             #if os(macOS)
-            let imageData = try? await description.loadImage().tiffRepresentation
+            let uiimage = try? await description.loadImage()
+            let imageData = uiimage?.tiffRepresentation
             #else
-            let imageData = try? await description.loadImage().pngData()
+            let uiimage = try? await description.loadImage()
+            let imageData = uiimage?.pngData()
             #endif
             let image = imageData?.base64EncodedString()
             let isCompleted = achievement?.isCompleted ?? false

games_services/shared_apple/Auth.swift → games_services/darwin/Classes/Auth.swift

@@ -1,5 +1,11 @@
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
+
 class Auth: BaseGamesServices {
-  
+
   func authenticateUser(result: @escaping FlutterResult) {
     currentPlayer.authenticateHandler = { vc, error in
       guard error == nil else {

games_services/shared_apple/BaseGamesServices.swift → games_services/darwin/Classes/BaseGamesServices.swift

@@ -1,4 +1,9 @@
 import GameKit
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 public class BaseGamesServices: NSObject {
 

games_services/shared_apple/Leaderboards.swift → games_services/darwin/Classes/Leaderboards.swift

@@ -1,4 +1,9 @@
 import GameKit
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 class Leaderboards: BaseGamesServices {
 

games_services/shared_apple/Player.swift → games_services/darwin/Classes/Player.swift

@@ -1,4 +1,9 @@
 import GameKit
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 class Player: BaseGamesServices {
 

games_services/shared_apple/SaveGame.swift → games_services/darwin/Classes/SaveGame.swift

@@ -1,4 +1,9 @@
 import GameKit
+#if os(iOS) || os(tvOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 class SaveGame: BaseGamesServices {
 

games_services/ios/games_services.podspec → games_services/darwin/games_services.podspec

@@ -14,9 +14,11 @@ A new Flutter plugin to support game center and google play games services.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.dependency 'Flutter'
   s.swift_version = '5.0'
 
+  s.ios.dependency 'Flutter'
+  s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '11.0'
+  s.osx.deployment_target = '11.0'
 end
 

games_services/example/ios/Flutter/Flutter.podspec

@@ -1,17 +1,17 @@
 #
-# NOTE: This podspec is NOT to be published. It is only used as a local source!
-#       This is a generated file; do not edit or check into version control.
+# This podspec is NOT to be published. It is only used as a local source!
+# This is a generated file; do not edit or check into version control.
 #
 
 Pod::Spec.new do |s|
   s.name             = 'Flutter'
   s.version          = '1.0.0'
-  s.summary          = 'High-performance, high-fidelity mobile apps.'
-  s.homepage         = 'https://flutter.io'
-  s.license          = { :type => 'MIT' }
+  s.summary          = 'A UI toolkit for beautiful and fast apps.'
+  s.homepage         = 'https://flutter.dev'
+  s.license          = { :type => 'BSD' }
   s.author           = { 'Flutter Dev Team' => '[email protected]' }
   s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '11.0'
   # Framework linking is handled by Flutter tooling, not CocoaPods.
   # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
   s.vendored_frameworks = 'path/to/nothing'

games_services/example/ios/Podfile.lock

@@ -2,21 +2,22 @@ PODS:
   - Flutter (1.0.0)
   - games_services (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - games_services (from `.symlinks/plugins/games_services/ios`)
+  - games_services (from `.symlinks/plugins/games_services/darwin`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   games_services:
-    :path: ".symlinks/plugins/games_services/ios"
+    :path: ".symlinks/plugins/games_services/darwin"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  games_services: 6c9a23d55bc6ae0129b24507e008643dcb02f341
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  games_services: 9d174ae29e8de7aa3f511bc00fedd7006594063f
 
 PODFILE CHECKSUM: 1d687fa337e018c706d6fe47544322b4937fa8f6
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.13.0

games_services/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -8,5 +8,5 @@ import Foundation
 import games_services
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  GamesServicesPlugin.register(with: registry.registrar(forPlugin: "GamesServicesPlugin"))
+  SwiftGamesServicesPlugin.register(with: registry.registrar(forPlugin: "GamesServicesPlugin"))
 }

games_services/example/macos/Podfile.lock

@@ -1,22 +1,23 @@
 PODS:
   - FlutterMacOS (1.0.0)
   - games_services (0.0.1):
+    - Flutter
     - FlutterMacOS
 
 DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
-  - games_services (from `Flutter/ephemeral/.symlinks/plugins/games_services/macos`)
+  - games_services (from `Flutter/ephemeral/.symlinks/plugins/games_services/darwin`)
 
 EXTERNAL SOURCES:
   FlutterMacOS:
     :path: Flutter/ephemeral
   games_services:
-    :path: Flutter/ephemeral/.symlinks/plugins/games_services/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/games_services/darwin
 
 SPEC CHECKSUMS:
-  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
-  games_services: eb1f60c78e6b358d8e0c7bd0f8c8c7303f8971da
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  games_services: 9d174ae29e8de7aa3f511bc00fedd7006594063f
 
 PODFILE CHECKSUM: 930001046a460e2eabc5bd6ba4e1e8c29018d186
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.13.0

games_services/pubspec.yaml

@@ -30,6 +30,8 @@ flutter:
         package: com.abedalkareem.games_services
         pluginClass: GamesServicesPlugin
       ios:
-        pluginClass: GamesServicesPlugin
+        pluginClass: SwiftGamesServicesPlugin
+        sharedDarwinSource: true
       macos:
-        pluginClass: GamesServicesPlugin
+        pluginClass: SwiftGamesServicesPlugin
+        sharedDarwinSource: true