From 6cbedf7d1c55471c8e13981c484bcdcb4bf9d615 Mon Sep 17 00:00:00 2001 From: wgh19 Date: Tue, 23 Apr 2024 11:53:57 +0800 Subject: [PATCH] update ios and macos --- cxx/prebuild.sh | 8 ++++---- ios/Classes/FlutterQjsPlugin.h | 4 ---- ios/Classes/FlutterQjsPlugin.m | 15 --------------- ios/Classes/FlutterQjsPlugin.swift | 19 ------------------- ios/Classes/SwiftFlutterQjsPlugin.swift | 14 -------------- ios/flutter_qjs.podspec | 4 ++-- 6 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 ios/Classes/FlutterQjsPlugin.h delete mode 100644 ios/Classes/FlutterQjsPlugin.m delete mode 100644 ios/Classes/FlutterQjsPlugin.swift delete mode 100644 ios/Classes/SwiftFlutterQjsPlugin.swift diff --git a/cxx/prebuild.sh b/cxx/prebuild.sh index b43fd20..1f0c66e 100644 --- a/cxx/prebuild.sh +++ b/cxx/prebuild.sh @@ -7,10 +7,10 @@ mkdir ./cxx sed 's/\#include \"quickjs\/quickjs.h\"/\#include \"quickjs.h\"/g' ../cxx/ffi.h > ./cxx/ffi.h cp ../cxx/ffi.cpp ./cxx/ffi.cpp -cp ../cxx/quickjs/*.h ./cxx/ -cp ../cxx/quickjs/cutils.c ./cxx/ -cp ../cxx/quickjs/libregexp.c ./cxx/ -cp ../cxx/quickjs/libunicode.c ./cxx/ +cp -r ../cxx/quickjs/* ./cxx + +rm ./cxx/quickjs.c + quickjs_version=$(cat ../cxx/quickjs/VERSION) diff --git a/ios/Classes/FlutterQjsPlugin.h b/ios/Classes/FlutterQjsPlugin.h deleted file mode 100644 index ce5065e..0000000 --- a/ios/Classes/FlutterQjsPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface FlutterQjsPlugin : NSObject -@end diff --git a/ios/Classes/FlutterQjsPlugin.m b/ios/Classes/FlutterQjsPlugin.m deleted file mode 100644 index c0fe170..0000000 --- a/ios/Classes/FlutterQjsPlugin.m +++ /dev/null @@ -1,15 +0,0 @@ -#import "FlutterQjsPlugin.h" -#if __has_include() -#import -#else -// Support project import fallback if the generated compatibility header -// is not copied when this plugin is created as a library. -// https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816 -#import "flutter_qjs-Swift.h" -#endif - -@implementation FlutterQjsPlugin -+ (void)registerWithRegistrar:(NSObject*)registrar { - [SwiftFlutterQjsPlugin registerWithRegistrar:registrar]; -} -@end diff --git a/ios/Classes/FlutterQjsPlugin.swift b/ios/Classes/FlutterQjsPlugin.swift deleted file mode 100644 index 3a307bd..0000000 --- a/ios/Classes/FlutterQjsPlugin.swift +++ /dev/null @@ -1,19 +0,0 @@ -import Flutter -import UIKit - -public class FlutterQjsPlugin: NSObject, FlutterPlugin { - public static func register(with registrar: FlutterPluginRegistrar) { - let channel = FlutterMethodChannel(name: "flutter_qjs", binaryMessenger: registrar.messenger()) - let instance = FlutterQjsPlugin() - registrar.addMethodCallDelegate(instance, channel: channel) - } - - public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { - switch call.method { - case "getPlatformVersion": - result("iOS " + UIDevice.current.systemVersion) - default: - result(FlutterMethodNotImplemented) - } - } -} diff --git a/ios/Classes/SwiftFlutterQjsPlugin.swift b/ios/Classes/SwiftFlutterQjsPlugin.swift deleted file mode 100644 index b87e92f..0000000 --- a/ios/Classes/SwiftFlutterQjsPlugin.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Flutter -import UIKit - -public class SwiftFlutterQjsPlugin: NSObject, FlutterPlugin { - public static func register(with registrar: FlutterPluginRegistrar) { - let channel = FlutterMethodChannel(name: "flutter_qjs", binaryMessenger: registrar.messenger()) - let instance = SwiftFlutterQjsPlugin() - registrar.addMethodCallDelegate(instance, channel: channel) - } - - public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { - result("iOS " + UIDevice.current.systemVersion) - } -} diff --git a/ios/flutter_qjs.podspec b/ios/flutter_qjs.podspec index 47e2697..be4a1ad 100644 --- a/ios/flutter_qjs.podspec +++ b/ios/flutter_qjs.podspec @@ -14,9 +14,9 @@ This plugin is a simple js engine for flutter using the `quickjs` project. Plugi s.author = { 'ekibun' => 'soekibun@gmail.com' } s.source = { :path => '.' } s.compiler_flags = '-DDUMP_LEAKS' - s.source_files = ['Classes/**/*', 'cxx/*.{c,cpp}'] + s.source_files = ['cxx/*.{c,cpp}'] s.dependency 'Flutter' - s.platform = :ios, '8.0' + 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' }