Merge branch 'main' into fix-support-non-root-base-href

Author: diegotori

wakelock_plus/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.3.1]
+* [#95](https://github.com/fluttercommunity/wakelock_plus/pull/95): Fix SPM integration. Thanks [diegotori](https://github.com/diegotori).
+
 ## [1.3.0]
 * [#90](https://github.com/fluttercommunity/wakelock_plus/pull/90): Add Swift Package Manager Support. Thanks [Gustl22](https://github.com/Gustl22).
 

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 (v25.3.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
@@ -44,6 +44,36 @@ class WakelockPlusFlutterError (
   override val message: String? = null,
   val details: Any? = null
 ) : Throwable()
+private fun deepEqualsWakelockPlusMessages(a: Any?, b: Any?): Boolean {
+  if (a is ByteArray && b is ByteArray) {
+      return a.contentEquals(b)
+  }
+  if (a is IntArray && b is IntArray) {
+      return a.contentEquals(b)
+  }
+  if (a is LongArray && b is LongArray) {
+      return a.contentEquals(b)
+  }
+  if (a is DoubleArray && b is DoubleArray) {
+      return a.contentEquals(b)
+  }
+  if (a is Array<*> && b is Array<*>) {
+    return a.size == b.size &&
+        a.indices.all{ deepEqualsWakelockPlusMessages(a[it], b[it]) }
+  }
+  if (a is List<*> && b is List<*>) {
+    return a.size == b.size &&
+        a.indices.all{ deepEqualsWakelockPlusMessages(a[it], b[it]) }
+  }
+  if (a is Map<*, *> && b is Map<*, *>) {
+    return a.size == b.size && a.all {
+        (b as Map<Any?, Any?>).containsKey(it.key) &&
+        deepEqualsWakelockPlusMessages(it.value, b[it.key])
+    }
+  }
+  return a == b
+}
+    
 
 /**
  * Message for toggling the wakelock on the platform side.
@@ -65,6 +95,16 @@ data class ToggleMessage (
       enable,
     )
   }
+  override fun equals(other: Any?): Boolean {
+    if (other !is ToggleMessage) {
+      return false
+    }
+    if (this === other) {
+      return true
+    }
+    return deepEqualsWakelockPlusMessages(toList(), other.toList())  }
+
+  override fun hashCode(): Int = toList().hashCode()
 }
 
 /**
@@ -87,6 +127,16 @@ data class IsEnabledMessage (
       enabled,
     )
   }
+  override fun equals(other: Any?): Boolean {
+    if (other !is IsEnabledMessage) {
+      return false
+    }
+    if (this === other) {
+      return true
+    }
+    return deepEqualsWakelockPlusMessages(toList(), other.toList())  }
+
+  override fun hashCode(): Int = toList().hashCode()
 }
 private open class WakelockPlusMessagesPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {

wakelock_plus/example/ios/Podfile.lock

@@ -25,10 +25,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
 
 PODFILE CHECKSUM: beab77b38961de946f08660e554f80ac174dc842
 
-COCOAPODS: 1.16.1
+COCOAPODS: 1.16.2

wakelock_plus/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

wakelock_plus/ios/.gitignore

@@ -9,6 +9,7 @@ profile
 
 DerivedData/
 build/
+.build/
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 

wakelock_plus/ios/wakelock_plus.podspec

@@ -16,7 +16,7 @@ Plugin that allows you to keep the device screen awake, i.e. prevent the screen
   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'
+  s.platform = :ios, '12.0'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

wakelock_plus/ios/wakelock_plus/Package.swift

@@ -17,7 +17,7 @@ let package = Package(
             name: "wakelock_plus",
             dependencies: [],
             resources: [
-                .process("Resources")
+                .process("PrivacyInfo.xcprivacy"),
             ],
             cSettings: [
                 .headerSearchPath("include/wakelock_plus")

wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/UIApplication+idleTimerLock.m

@@ -5,7 +5,7 @@
 //  Created by suyao on 2021/12/17.
 //
 
-#import "UIApplication+idleTimerLock.h"
+#import "./include/wakelock_plus/UIApplication+idleTimerLock.h"
 #import <objc/runtime.h>
 
 static NSString *idleTimerLockKey = @"idleTimerLockKey";

wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/WakelockPlusPlugin.m

@@ -1,6 +1,6 @@
-#import "WakelockPlusPlugin.h"
-#import "messages.g.h"
-#import "UIApplication+idleTimerLock.h"
+#import "./include/wakelock_plus/WakelockPlusPlugin.h"
+#import "./include/wakelock_plus/messages.g.h"
+#import "./include/wakelock_plus/UIApplication+idleTimerLock.h"
 
 @interface WakelockPlusPlugin () <WAKELOCKPLUSWakelockPlusApi>
 

wakelock_plus/ios/wakelock_plus/Sources/wakelock_plus/include/wakelock_plus/messages.g.h

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.7.0), do not edit directly.
+// Autogenerated from Pigeon (v25.3.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>