Skip to content

Commit

Permalink
Remove bitcode from iOS and make available on SPM (#408)
Browse files Browse the repository at this point in the history
  • Loading branch information
albho authored Jan 6, 2025
1 parent a40f412 commit 72e0313
Show file tree
Hide file tree
Showing 26 changed files with 493 additions and 135 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/flutter-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

build-ios:
name: Build iOS demo
runs-on: macos-12
runs-on: macos-14
strategy:
matrix:
flutter-version: ['3.3.0', '3.22.2']
Expand Down
5 changes: 4 additions & 1 deletion binding/flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@
* Update native packages

## [2.0.2] - 2024-02-08
* Additional gradle plugin build support
* Additional gradle plugin build support

## [2.0.3] - 2025-01-06
* Update native packages
2 changes: 1 addition & 1 deletion binding/flutter/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'ai.picovoice.flutter.leopard'
version '2.0.2'
version '2.0.3'

buildscript {
repositories {
Expand Down
4 changes: 2 additions & 2 deletions binding/flutter/ios/leopard_flutter.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'leopard_flutter'
s.version = '2.0.2'
s.version = '2.0.3'
s.summary = 'A Flutter package plugin for Picovoice\'s Leopard Speech-to-Text engine'
s.description = <<-DESC
A Flutter package plugin for Picovoice\'s Leopard Speech-to-Text engine
Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.source_files = 'Classes/**/*'
s.platform = :ios, '13.0'
s.dependency 'Flutter'
s.dependency 'Leopard-iOS', '~> 2.0.1'
s.dependency 'Leopard-iOS', '~> 2.0.2'

s.swift_version = '5.0'
end
56 changes: 40 additions & 16 deletions binding/flutter/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,30 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
lints:
dependency: "direct dev"
description:
Expand All @@ -87,34 +111,34 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.15.0"
path:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -244,10 +268,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.7.2"
vector_math:
dependency: transitive
description:
Expand All @@ -256,14 +280,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
vm_service:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "14.2.5"
win32:
dependency: transitive
description:
Expand All @@ -281,5 +305,5 @@ packages:
source: hosted
version: "0.2.0+3"
sdks:
dart: ">=3.2.0-194.0.dev <4.0.0"
flutter: ">=2.8.1"
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
2 changes: 1 addition & 1 deletion binding/flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: leopard_flutter
description: A Flutter plugin for Picovoice's Leopard Speech-to-Text engine
version: 2.0.2
version: 2.0.3
homepage: https://picovoice.ai/
repository: https://github.com/Picovoice/leopard/
documentation: https://picovoice.ai/docs/leopard/
Expand Down
2 changes: 1 addition & 1 deletion binding/react-native/leopard-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Pod::Spec.new do |s|
s.source_files = "ios/*.{h,m,mm,swift}"

s.dependency "React"
s.dependency "Leopard-iOS", '~> 2.0.1'
s.dependency "Leopard-iOS", '~> 2.0.2'
end
2 changes: 1 addition & 1 deletion binding/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@picovoice/leopard-react-native",
"version": "2.0.2",
"version": "2.0.3",
"description": "Picovoice Leopard React Native binding",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
20 changes: 10 additions & 10 deletions binding/react-native/test-app/LeopardTestApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ PODS:
- hermes-engine (0.71.18):
- hermes-engine/Pre-built (= 0.71.18)
- hermes-engine/Pre-built (0.71.18)
- ios-voice-processor (1.1.0)
- Leopard-iOS (2.0.1)
- leopard-react-native (2.0.2):
- Leopard-iOS (~> 2.0.1)
- ios-voice-processor (1.2.0)
- Leopard-iOS (2.0.2)
- leopard-react-native (2.0.3):
- Leopard-iOS (~> 2.0.2)
- React
- libevent (2.1.12)
- RCT-Folly (2021.07.22.00):
Expand Down Expand Up @@ -271,8 +271,8 @@ PODS:
- React-jsinspector (0.71.18)
- React-logger (0.71.18):
- glog
- react-native-voice-processor (1.2.0):
- ios-voice-processor (~> 1.1.0)
- react-native-voice-processor (1.2.3):
- ios-voice-processor (~> 1.2.0)
- React-Core
- React-perflogger (0.71.18)
- React-RCTActionSheet (0.71.18):
Expand Down Expand Up @@ -495,9 +495,9 @@ SPEC CHECKSUMS:
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: 251dcc3511fc68678e2ee96dd7d175d9489b781e
ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
Leopard-iOS: 8c94dcf886800b4ed361c1c6af763780ef16f722
leopard-react-native: 46a409dd56972001d19a017e3261beaeb7c2b0b9
ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97
Leopard-iOS: 636fd4245497e1f7c348a8e346a6a9357ac07d0c
leopard-react-native: d9ddaba32c900b7dda05571749c244186a807671
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: 467cd79889cbcfd008d0ff7c697f73765d4578c3
Expand All @@ -513,7 +513,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: a60e1117c011cbb6a95418f4bf67d6dfbbf81772
React-jsinspector: 7218c92923292e20326a1eed3104fe90393ca449
React-logger: 166cf6649b5ea9e26ab816073dd0e68020561d65
react-native-voice-processor: aefb0845641c7d67dd47e69606ba7ebb38aab5cd
react-native-voice-processor: 47d7906332e258dcd1f2ee089bdb9bf0f6809ccf
React-perflogger: c8849042b03392681ebd5d99a0775dbadfad2c74
React-RCTActionSheet: 6bd3b502da266d69942e9ce4bc13666f90544620
React-RCTAnimation: 63fbec04ae279b387ac786898bd5a918b8875f48
Expand Down
2 changes: 1 addition & 1 deletion binding/react-native/test-app/LeopardTestApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@picovoice/leopard-react-native": "file:../..",
"@picovoice/react-native-voice-processor": "~1.2.0",
"@picovoice/react-native-voice-processor": "1.2.3",
"base-64": "^1.0.0",
"react": "18.2.0",
"react-native": "0.71.18",
Expand Down
10 changes: 5 additions & 5 deletions binding/react-native/test-app/LeopardTestApp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1442,12 +1442,12 @@
fastq "^1.6.0"

"@picovoice/leopard-react-native@file:../..":
version "2.0.2"
version "2.0.3"

"@picovoice/react-native-voice-processor@~1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.0.tgz#82a98b41d9236ababe330dae873062ee0e1b24c3"
integrity sha512-zolTEo3qsqeUwY7JRslV/yhiA+oBrkeogOTxjHIEJ//yEsr7YKlI1PcqTbU5/xjmUiukh62gmwTXhosnQYdasQ==
"@picovoice/react-native-voice-processor@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@picovoice/react-native-voice-processor/-/react-native-voice-processor-1.2.3.tgz#f07a2b526922bba1c2b542bbcd842897aab4c241"
integrity sha512-GFnuKXWIOrDTPumcFkwfGaGUt2X1Vq31cU0sM4CZ9o/SomZQxJml12nr8d4uxjG03Z/eouWGN/0AcxZPdqihlw==

"@react-native-community/cli-clean@^10.1.1":
version "10.1.1"
Expand Down
2 changes: 1 addition & 1 deletion demo/flutter/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 0 additions & 2 deletions demo/flutter/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
flutter_ios_podfile_setup

target 'Runner' do
pod 'Leopard-iOS', '~> 2.0.1'

use_frameworks!
use_modular_headers!

Expand Down
29 changes: 14 additions & 15 deletions demo/flutter/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
PODS:
- Flutter (1.0.0)
- flutter_voice_processor (1.1.0):
- flutter_voice_processor (1.1.2):
- Flutter
- ios-voice-processor (~> 1.1.0)
- ios-voice-processor (~> 1.2.0)
- integration_test (0.0.1):
- Flutter
- ios-voice-processor (1.1.0)
- Leopard-iOS (2.0.1)
- leopard_flutter (2.0.0):
- ios-voice-processor (1.2.0)
- Leopard-iOS (2.0.2)
- leopard_flutter (2.0.3):
- Flutter
- Leopard-iOS (~> 2.0.0)
- Leopard-iOS (~> 2.0.2)
- path_provider_ios (0.0.1):
- Flutter

DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_voice_processor (from `.symlinks/plugins/flutter_voice_processor/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- Leopard-iOS (~> 2.0.1)
- leopard_flutter (from `.symlinks/plugins/leopard_flutter/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)

Expand All @@ -39,14 +38,14 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/path_provider_ios/ios"

SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_voice_processor: 53afbf59ad3feb82f4a379fea9ed8dc98495210f
integration_test: 13825b8a9334a850581300559b8839134b124670
ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
Leopard-iOS: 8c94dcf886800b4ed361c1c6af763780ef16f722
leopard_flutter: 7e55a7ee805767993c1a619bb42d9ea27cc0e557
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_voice_processor: 9ebe2cae6612db22d20e7e7833937ea19fa3e59c
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
ios-voice-processor: 6b5ca08962f39e434fe39dca0f483d923a3b1b97
Leopard-iOS: 636fd4245497e1f7c348a8e346a6a9357ac07d0c
leopard_flutter: 5440ec6ff3b4929d16a6d3b055cc265782e0857e
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02

PODFILE CHECKSUM: 941bd88b00cfb6fae05754c4454f5e3d21000f14
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b

COCOAPODS: 1.11.3
COCOAPODS: 1.16.2
13 changes: 8 additions & 5 deletions demo/flutter/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -155,7 +155,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -199,10 +199,12 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand Down Expand Up @@ -230,6 +232,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -339,7 +342,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_STYLE = "non-global";
Expand Down Expand Up @@ -429,7 +432,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -479,7 +482,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
STRIP_STYLE = "non-global";
Expand Down
Loading

0 comments on commit 72e0313

Please sign in to comment.