Skip to content

Commit

Permalink
v1.2 (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
laves authored Jan 27, 2023
1 parent e22a971 commit 6dfd095
Show file tree
Hide file tree
Showing 72 changed files with 319 additions and 293 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/android-appcenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ on:
push:
branches: [ main ]
paths:
- 'demo/android/Activity/cobra-activity-demo-app/build.gradle'
- 'demo/android/Activity/cobra-activity-demo-app/build.gradle'
- '.github/workflows/android-appcenter.yml'

pull_request:
branches: [ main ]
paths:
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'demo/android/Activity/cobra-activity-demo-app/build.gradle'
- '.github/workflows/android-appcenter.yml'

defaults:
run:
working-directory: demo/android/Activity

jobs:
build:
name: Run Android Tests on AppCenter
Expand Down Expand Up @@ -51,11 +51,11 @@ jobs:
run: ./gradlew assembleAndroidTest

- name: Run tests on AppCenter
run: appcenter test run espresso
run: appcenter test run espresso
--token ${{secrets.APPCENTERAPITOKEN}}
--app "Picovoice/Cobra-Android-Activity"
--devices "Picovoice/android-min-max"
--devices "Picovoice/android-min-max"
--app-path cobra-activity-demo-app/build/outputs/apk/debug/cobra-activity-demo-app-debug.apk
--test-series "cobra-android"
--locale "en_US"
--locale "en_US"
--build-dir cobra-activity-demo-app/build/outputs/apk/androidTest/debug
34 changes: 17 additions & 17 deletions .github/workflows/android-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ on:
workflow_dispatch:
push:
branches: [ main ]
paths:
paths:
- 'lib/android/**'
- '.github/workflows/android-perf.yml'
pull_request:
branches: [ main ]
paths:
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'lib/android/**'
- '.github/workflows/android-perf.yml'

defaults:
run:
working-directory: demo/android/Activity

jobs:
build:
name: Run Android Speed Tests on AppCenter
Expand All @@ -29,26 +29,26 @@ jobs:
- device: single-android
performanceThresholdSec: 0.003
- device: 32bit-android
performanceThresholdSec: 0.007
performanceThresholdSec: 0.015

steps:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/[email protected]

- name: Install AppCenter CLI
run: npm install -g appcenter-cli

- name: set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'

- name: Copy test_resources
run: ./copy_test_resources.sh

- name: Inject AccessKey
run: echo pvTestingAccessKey="${{secrets.PV_VALID_ACCESS_KEY}}" >> local.properties

Expand All @@ -57,22 +57,22 @@ jobs:

- name: Inject Performance Threshold
run: echo performanceThresholdSec="${{ matrix.performanceThresholdSec }}" >> local.properties

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build app
run: ./gradlew assembleDebug

- name: Build androidTest
run: ./gradlew assembleAndroidTest

- name: Run tests on AppCenter
run: appcenter test run espresso
run: appcenter test run espresso
--token ${{secrets.APPCENTERAPITOKEN}}
--app "Picovoice/Cobra-Android-Activity"
--devices "Picovoice/${{ matrix.device }}"
--devices "Picovoice/${{ matrix.device }}"
--app-path cobra-activity-demo-app/build/outputs/apk/debug/cobra-activity-demo-app-debug.apk
--test-series "cobra-android"
--locale "en_US"
--locale "en_US"
--build-dir cobra-activity-demo-app/build/outputs/apk/androidTest/debug
14 changes: 13 additions & 1 deletion .github/workflows/c-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,24 @@ on:
paths:
- 'demo/c/**'
- '!demo/c/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
- 'lib/windows/**'
- '.github/workflows/c-demos.yml'
pull_request:
branches: [ main ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'demo/c/**'
- '!demo/c/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
- 'lib/windows/**'
- '.github/workflows/c-demos.yml'

defaults:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ios-appcenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ on:
workflow_dispatch:
push:
branches: [ main ]
paths:
paths:
- 'binding/ios/CobraAppTest/Podfile.lock'
- '.github/workflows/ios-appcenter.yml'

pull_request:
branches: [ main ]
paths:
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'binding/ios/CobraAppTest/Podfile.lock'
- '.github/workflows/ios-appcenter.yml'


defaults:
run:
working-directory: binding/ios/CobraAppTest

jobs:
build:
name: Run iOS Tests on AppCenter
Expand Down Expand Up @@ -48,19 +48,19 @@ jobs:
CobraAppTestUITests/CobraAppTestUITests.swift

- name: XCode Build
run: xcrun xcodebuild build-for-testing
-configuration Debug
run: xcrun xcodebuild build-for-testing
-configuration Debug
-workspace CobraAppTest.xcworkspace
-sdk iphoneos
-sdk iphoneos
-scheme CobraAppTest
-derivedDataPath ddp
CODE_SIGNING_ALLOWED=NO

- name: Run Tests on AppCenter
run: appcenter test run xcuitest
run: appcenter test run xcuitest
--token ${{secrets.APPCENTERAPITOKEN}}
--app "Picovoice/Cobra-iOS"
--devices "Picovoice/ios-min-max"
--test-series "cobra-ios"
--locale "en_US"
--devices "Picovoice/ios-min-max"
--test-series "cobra-ios"
--locale "en_US"
--build-dir ddp/Build/Products/Debug-iphoneos
30 changes: 14 additions & 16 deletions .github/workflows/ios-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,29 @@ on:
workflow_dispatch:
push:
branches: [ main ]
paths:
paths:
- 'lib/ios/**'
- '.github/workflows/ios-perf.yml'
pull_request:
branches: [ main ]
paths:
branches: [ main, 'v[0-9]+.[0-9]+*' ]
paths:
- 'lib/ios/**'
- '.github/workflows/ios-perf.yml'

defaults:
run:
working-directory: binding/ios/CobraAppTest

jobs:
build:
name: Run iOS Tests on AppCenter
runs-on: macos-latest

strategy:
matrix:
device: [iOS-14.5, iOS-32bit]
device: [ ios-perf ]
include:
- device: iOS-14.5
performanceThresholdSec: 0.001
- device: iOS-32bit
- device: ios-perf
performanceThresholdSec: 0.001

steps:
Expand Down Expand Up @@ -63,19 +61,19 @@ jobs:
PerformanceTest/PerformanceTest.swift

- name: XCode Build
run: xcrun xcodebuild build-for-testing
-configuration Debug
run: xcrun xcodebuild build-for-testing
-configuration Debug
-workspace CobraAppTest.xcworkspace
-sdk iphoneos
-sdk iphoneos
-scheme PerformanceTest
-derivedDataPath ddp
CODE_SIGNING_ALLOWED=NO

- name: Run Tests on AppCenter
run: appcenter test run xcuitest
run: appcenter test run xcuitest
--token ${{secrets.APPCENTERAPITOKEN}}
--app "Picovoice/Cobra-iOS"
--devices "Picovoice/${{ matrix.device }}"
--test-series "cobra-ios"
--locale "en_US"
--devices "Picovoice/${{ matrix.device }}"
--test-series "cobra-ios"
--locale "en_US"
--build-dir ddp/Build/Products/Debug-iphoneos
2 changes: 1 addition & 1 deletion .github/workflows/python-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- 'lib/windows/**'
- 'res/**'
pull_request:
branches: [ main ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'binding/python/test_cobra_perf.py'
- 'lib/beaglebone/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- 'lib/windows/**'
- 'res/**'
pull_request:
branches: [ main ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'binding/python/**'
- '!binding/python/README.md'
Expand All @@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.5' , '3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Rust
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'binding/rust/**'
- '!binding/rust/README.md'
Expand All @@ -15,7 +15,7 @@ on:
- 'lib/windows/**'
- '.github/workflows/rust.yml'
pull_request:
branches: [ master ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'binding/rust/**'
- '!binding/rust/README.md'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'lib/wasm/**'
- '.github/workflows/web-perf.yml'
pull_request:
branches: [ main ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'lib/wasm/**'
- '.github/workflows/web-perf.yml'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- 'lib/wasm/**'
- '.github/workflows/web.yml'
pull_request:
branches: [ main ]
branches: [ main, 'v[0-9]+.[0-9]+' ]
paths:
- 'binding/web/**'
- '!binding/web/README.md'
Expand Down
3 changes: 2 additions & 1 deletion binding/android/cobra/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
src/main/jniLibs/**/*.so
9 changes: 8 additions & 1 deletion binding/android/cobra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'

ext {
PUBLISH_GROUP_ID = 'ai.picovoice'
PUBLISH_VERSION = '1.1.2'
PUBLISH_VERSION = '1.2.0'
PUBLISH_ARTIFACT_ID = 'cobra-android'
}

Expand Down Expand Up @@ -40,3 +40,10 @@ if (file("${rootDir}/publish-mavencentral.gradle").exists()) {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
}

task copyLibs(type: Copy) {
from("${rootDir}/../../lib/android")
into("${rootDir}/cobra/src/main/jniLibs")
}

preBuild.dependsOn copyLibs
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions binding/ios/Cobra-iOS.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'Cobra-iOS'
s.module_name = 'Cobra'
s.version = '1.1.1'
s.version = '1.2.0'
s.license = {:type => 'Apache 2.0'}
s.summary = 'iOS binding for Picovoice\'s Cobra voice activity detection (VAD) engine.'
s.description =
Expand All @@ -12,8 +12,8 @@ Pod::Spec.new do |s|
DESC
s.homepage = 'https://github.com/Picovoice/cobra/tree/master/binding/ios'
s.author = { 'Picovoice' => '[email protected]' }
s.source = { :git => "https://github.com/Picovoice/cobra.git", :tag => "Cobra-iOS-v1.1.1" }
s.ios.deployment_target = '9.0'
s.source = { :git => "https://github.com/Picovoice/cobra.git", :tag => "Cobra-iOS-v1.2.0" }
s.ios.deployment_target = '11.0'
s.swift_version = '5.0'
s.vendored_frameworks = 'lib/ios/PvCobra.xcframework'
s.source_files = 'binding/ios/*.{swift}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -593,7 +593,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
Loading

0 comments on commit 6dfd095

Please sign in to comment.