From 16ec14bc0f251ad6e1257060ca455c5fdbc9a7c4 Mon Sep 17 00:00:00 2001 From: swi-oberhauser Date: Mon, 24 Mar 2025 15:59:03 +0100 Subject: [PATCH 1/2] Add Swift Package Manager Support (closes #80) --- .../plus/wakelock/WakelockPlusMessages.g.kt | 2 +- wakelock_plus/ios/Assets/.gitkeep | 0 wakelock_plus/ios/wakelock_plus.podspec | 6 ++--- wakelock_plus/ios/wakelock_plus/Package.swift | 27 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 0 .../UIApplication+idleTimerLock.m | 0 .../wakelock_plus}/WakelockPlusPlugin.m | 0 .../UIApplication+idleTimerLock.h | 0 .../wakelock_plus}/WakelockPlusPlugin.h | 0 .../include/wakelock_plus}/messages.g.h | 0 .../Sources/wakelock_plus}/messages.g.m | 2 +- wakelock_plus/pigeons/messages.dart | 5 ++-- 12 files changed, 35 insertions(+), 7 deletions(-) delete mode 100644 wakelock_plus/ios/Assets/.gitkeep create mode 100644 wakelock_plus/ios/wakelock_plus/Package.swift rename wakelock_plus/ios/{ => wakelock_plus/Sources/wakelock_plus}/Resources/PrivacyInfo.xcprivacy (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus}/UIApplication+idleTimerLock.m (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus}/WakelockPlusPlugin.m (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus/include/wakelock_plus}/UIApplication+idleTimerLock.h (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus/include/wakelock_plus}/WakelockPlusPlugin.h (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus/include/wakelock_plus}/messages.g.h (100%) rename wakelock_plus/ios/{Classes => wakelock_plus/Sources/wakelock_plus}/messages.g.m (99%) diff --git a/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt b/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt index e6701b1..d5fbca2 100644 --- a/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt +++ b/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.7.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.4), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") diff --git a/wakelock_plus/ios/Assets/.gitkeep b/wakelock_plus/ios/Assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/wakelock_plus/ios/wakelock_plus.podspec b/wakelock_plus/ios/wakelock_plus.podspec index 0e6b79b..ed17d5b 100644 --- a/wakelock_plus/ios/wakelock_plus.podspec +++ b/wakelock_plus/ios/wakelock_plus.podspec @@ -13,12 +13,12 @@ Plugin that allows you to keep the device screen awake, i.e. prevent the screen s.license = { :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'wakelock_plus/Sources/wakelock_plus/**/*.{h,m}' + s.public_header_files = 'wakelock_plus/Sources/wakelock_plus/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '11.0' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } - s.resource_bundles = {'wakelock_plus_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'wakelock_plus_privacy' => ['wakelock_plus/Sources/wakelock_plus/Resources/PrivacyInfo.xcprivacy']} end diff --git a/wakelock_plus/ios/wakelock_plus/Package.swift b/wakelock_plus/ios/wakelock_plus/Package.swift new file mode 100644 index 0000000..790ec85 --- /dev/null +++ b/wakelock_plus/ios/wakelock_plus/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "wakelock_plus", + platforms: [ + .iOS("11.0") + ], + products: [ + .library(name: "wakelock-plus", targets: ["wakelock_plus"]) + ], + dependencies: [], + targets: [ + .target( + name: "wakelock_plus", + dependencies: [], + resources: [ + .process("Resources") + ], + cSettings: [ + .headerSearchPath("include/wakelock_plus") + ] + ) + ] +) \ No newline at end of file diff --git a/wakelock_plus/ios/Resources/PrivacyInfo.xcprivacy b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from wakelock_plus/ios/Resources/PrivacyInfo.xcprivacy rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/Resources/PrivacyInfo.xcprivacy diff --git a/wakelock_plus/ios/Classes/UIApplication+idleTimerLock.m b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/UIApplication+idleTimerLock.m similarity index 100% rename from wakelock_plus/ios/Classes/UIApplication+idleTimerLock.m rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/UIApplication+idleTimerLock.m diff --git a/wakelock_plus/ios/Classes/WakelockPlusPlugin.m b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/WakelockPlusPlugin.m similarity index 100% rename from wakelock_plus/ios/Classes/WakelockPlusPlugin.m rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/WakelockPlusPlugin.m diff --git a/wakelock_plus/ios/Classes/UIApplication+idleTimerLock.h b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/UIApplication+idleTimerLock.h similarity index 100% rename from wakelock_plus/ios/Classes/UIApplication+idleTimerLock.h rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/UIApplication+idleTimerLock.h diff --git a/wakelock_plus/ios/Classes/WakelockPlusPlugin.h b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/WakelockPlusPlugin.h similarity index 100% rename from wakelock_plus/ios/Classes/WakelockPlusPlugin.h rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/WakelockPlusPlugin.h diff --git a/wakelock_plus/ios/Classes/messages.g.h b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h similarity index 100% rename from wakelock_plus/ios/Classes/messages.g.h rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h diff --git a/wakelock_plus/ios/Classes/messages.g.m b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/messages.g.m similarity index 99% rename from wakelock_plus/ios/Classes/messages.g.m rename to wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/messages.g.m index 9a7105c..25110f4 100644 --- a/wakelock_plus/ios/Classes/messages.g.m +++ b/wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/messages.g.m @@ -1,7 +1,7 @@ // Autogenerated from Pigeon (v22.7.0), do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "messages.g.h" +#import "./include/wakelock_plus/messages.g.h" #if TARGET_OS_OSX #import diff --git a/wakelock_plus/pigeons/messages.dart b/wakelock_plus/pigeons/messages.dart index f179cf0..41ab1d2 100644 --- a/wakelock_plus/pigeons/messages.dart +++ b/wakelock_plus/pigeons/messages.dart @@ -13,10 +13,11 @@ class IsEnabledMessage { @ConfigurePigeon(PigeonOptions( dartOut: '../wakelock_plus_platform_interface/lib/messages.g.dart', dartTestOut: '../wakelock_plus_platform_interface/test/messages.g.dart', - objcHeaderOut: 'ios/Classes/messages.g.h', - objcSourceOut: 'ios/Classes/messages.g.m', + objcHeaderOut: 'ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h', + objcSourceOut: 'ios/wakelock_plus/Sources/wakelock_plus/messages.g.m', objcOptions: ObjcOptions( prefix: 'WAKELOCKPLUS', + headerIncludePath: './include/wakelock_plus/messages.g.h', ), kotlinOptions: KotlinOptions(errorClassName: "WakelockPlusFlutterError"), kotlinOut: From cb57b87381b8c4b1bb6ecf735d00a1a3f18a2f06 Mon Sep 17 00:00:00 2001 From: swi-oberhauser Date: Tue, 25 Mar 2025 15:07:02 +0100 Subject: [PATCH 2/2] Reformat --- .../fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt | 2 +- wakelock_plus/pigeons/messages.dart | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt b/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt index d5fbca2..e6701b1 100644 --- a/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt +++ b/wakelock_plus/android/src/main/kotlin/dev/fluttercommunity/plus/wakelock/WakelockPlusMessages.g.kt @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.7.4), do not edit directly. +// Autogenerated from Pigeon (v22.7.0), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") diff --git a/wakelock_plus/pigeons/messages.dart b/wakelock_plus/pigeons/messages.dart index 41ab1d2..d2f1828 100644 --- a/wakelock_plus/pigeons/messages.dart +++ b/wakelock_plus/pigeons/messages.dart @@ -13,7 +13,8 @@ class IsEnabledMessage { @ConfigurePigeon(PigeonOptions( dartOut: '../wakelock_plus_platform_interface/lib/messages.g.dart', dartTestOut: '../wakelock_plus_platform_interface/test/messages.g.dart', - objcHeaderOut: 'ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h', + objcHeaderOut: + 'ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h', objcSourceOut: 'ios/wakelock_plus/Sources/wakelock_plus/messages.g.m', objcOptions: ObjcOptions( prefix: 'WAKELOCKPLUS',