[flutter_appauth] reverts changes done for Swift Package Manager supp…

…ort (#580)

* Revert "[flutter_appauth] added Swift Package Manager support (#578)"

This reverts commit 71c14cb.

* bumped plugin to 8.0.3 to release without incomplete SPM support

* pinned compileSdkVersion of Android app to 34

flutter_appauth/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [8.0.3]
+
+* [iOS][macOS] reverted change on attempt to add Swift Package Manager as there were issues found. 8.0.2 has now been considered retracted on pub.dev as a result
+* Pinned compileSdkVersion of Android example app to 34 to continue support the current AGP versions until plugin and example app are updated
+
+
 ## [8.0.2]
 
 * [iOS][macOS] bumped AppAuth iOS dependency to 1.7.6

flutter_appauth/example/android/app/build.gradle

@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "io.crossingthestreams.flutter_appauth_example"
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {

flutter_appauth/ios/flutter_appauth/Sources/flutter_appauth/AppAuthIOSAuthorization.m → flutter_appauth/ios/Classes/AppAuthIOSAuthorization.m

@@ -1,4 +1,4 @@
-#import "./include/flutter_appauth/AppAuthIOSAuthorization.h"
+#import "AppAuthIOSAuthorization.h"
 
 @implementation AppAuthIOSAuthorization
 

flutter_appauth/ios/flutter_appauth/Sources/flutter_appauth/FlutterAppAuth.m → flutter_appauth/ios/Classes/FlutterAppAuth.m

@@ -1,4 +1,4 @@
-#import "./include/flutter_appauth/FlutterAppAuth.h"
+#import "FlutterAppAuth.h"
 
 @implementation FlutterAppAuth
 

flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/FlutterAppauthPlugin.m → flutter_appauth/ios/Classes/FlutterAppauthPlugin.m

@@ -1,6 +1,6 @@
 #import <TargetConditionals.h>
 
-#import "./include/flutter_appauth/FlutterAppauthPlugin.h"
+#import "FlutterAppauthPlugin.h"
 
 @interface ArgumentProcessor : NSObject
 + (id _Nullable)processArgumentValue:(NSDictionary *)arguments

flutter_appauth/ios/flutter_appauth/Sources/flutter_appauth/OIDExternalUserAgentIOSNoSSO.m → flutter_appauth/ios/Classes/OIDExternalUserAgentIOSNoSSO.m

@@ -6,7 +6,7 @@
    13 or newer to avoid cookies being shared across the device.
  */
 
-#import "./include/flutter_appauth/OIDExternalUserAgentIOSNoSSO.h"
+#import "OIDExternalUserAgentIOSNoSSO.h"
 
 #import <AuthenticationServices/AuthenticationServices.h>
 #import <SafariServices/SafariServices.h>

flutter_appauth/ios/flutter_appauth/Sources/flutter_appauth/OIDExternalUserAgentIOSSafariViewController.m → flutter_appauth/ios/Classes/OIDExternalUserAgentIOSSafariViewController.m

@@ -14,7 +14,7 @@
         limitations under the License.
  */
 
-#import "./include/flutter_appauth/OIDExternalUserAgentIOSSafariViewController.h"
+#import "OIDExternalUserAgentIOSSafariViewController.h"
 
 #import <SafariServices/SafariServices.h>
 

flutter_appauth/ios/flutter_appauth.podspec

@@ -12,11 +12,11 @@ A new flutter plugin project.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Your Company' => '[email protected]' }
   s.source           = { :path => '.' }
-  s.source_files = 'flutter_appauth/Sources/flutter_appauth/**/*.{h,m}'
-  s.public_header_files = 'flutter_appauth/Sources/flutter_appauth/include/**/*.h'
+  s.source_files = 'Classes/**/*'
+  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'AppAuth', '1.7.6'
   s.ios.deployment_target = '11.0'
-  s.resource_bundles = {'flutter_appauth_privacy' => ['flutter_appauth/Sources/flutter_appauth/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'flutter_appauth_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
 end
 

flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/AppAuthMacOSAuthorization.m → flutter_appauth/macos/Classes/AppAuthMacOSAuthorization.m

@@ -1,4 +1,4 @@
-#import "./include/flutter_appauth/AppAuthMacOSAuthorization.h"
+#import "AppAuthMacOSAuthorization.h"
 
 @implementation AppAuthMacOSAuthorization
 

flutter_appauth/macos/Classes/FlutterAppAuth.h

@@ -0,0 +1 @@
+../../ios/Classes/FlutterAppAuth.h

flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/FlutterAppAuth.m → flutter_appauth/macos/Classes/FlutterAppAuth.m

@@ -1,4 +1,4 @@
-#import "./include/flutter_appauth/FlutterAppAuth.h"
+#import "FlutterAppAuth.h"
 
 @implementation FlutterAppAuth
 

flutter_appauth/macos/Classes/FlutterAppauthPlugin.h

@@ -0,0 +1 @@
+../../ios/Classes/FlutterAppauthPlugin.h

flutter_appauth/ios/flutter_appauth/Sources/flutter_appauth/FlutterAppauthPlugin.m → flutter_appauth/macos/Classes/FlutterAppauthPlugin.m

@@ -1,6 +1,6 @@
 #import <TargetConditionals.h>
 
-#import "./include/flutter_appauth/FlutterAppauthPlugin.h"
+#import "FlutterAppauthPlugin.h"
 
 @interface ArgumentProcessor : NSObject
 + (id _Nullable)processArgumentValue:(NSDictionary *)arguments

flutter_appauth/macos/flutter_appauth/Sources/flutter_appauth/OIDExternalUserAgentMacNoSSO.m → flutter_appauth/macos/Classes/OIDExternalUserAgentMacNoSSO.m

@@ -18,7 +18,7 @@
         limitations under the License.
  */
 
-#import "./include/flutter_appauth/OIDExternalUserAgentMacNoSSO.h"
+#import "OIDExternalUserAgentMacNoSSO.h"
 
 #import <AuthenticationServices/AuthenticationServices.h>
 #import <Cocoa/Cocoa.h>

flutter_appauth/macos/flutter_appauth.podspec

@@ -12,11 +12,10 @@ A new flutter plugin project.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Your Company' => '[email protected]' }
   s.source           = { :path => '.' }
-  s.source_files = 'flutter_appauth/Sources/flutter_appauth/**/*.{h,m}'
-  s.public_header_files = 'flutter_appauth/Sources/flutter_appauth/include/**/*.h'
+  s.source_files = 'Classes/**/*'
+  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'FlutterMacOS'
   s.dependency 'AppAuth', '1.7.6'
   s.platform = :osx, '10.14'
   s.osx.deployment_target = "10.14"
-  s.resource_bundles = {'flutter_appauth_privacy' => ['flutter_appauth/Sources/flutter_appauth/PrivacyInfo.xcprivacy']}
 end

flutter_appauth/pubspec.yaml

@@ -2,7 +2,7 @@ name: flutter_appauth
 description: This plugin provides an abstraction around the Android and iOS
   AppAuth SDKs so it can be used to communicate with OAuth 2.0 and OpenID
   Connect providers
-version: 8.0.2
+version: 8.0.3
 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth
 
 environment: