From 811bb7b0271c369081d56a65edb18efc8b78581e Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Fri, 22 Dec 2023 16:32:41 -0800 Subject: [PATCH] Java upgrades (#755) --- README.md | 3 +- demo/android/Activity/build.gradle | 7 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../picovoice-activity-demo-app/build.gradle | 3 +- .../src/main/AndroidManifest.xml | 3 +- demo/android/Service/build.gradle | 7 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../picovoice-service-demo-app/build.gradle | 3 +- .../src/main/AndroidManifest.xml | 3 +- demo/flutter-clock/android/app/build.gradle | 12 +- demo/flutter-clock/android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- demo/flutter-clock/pubspec.lock | 172 ++++++++------- demo/flutter/android/app/build.gradle | 4 +- demo/flutter/android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- demo/flutter/pubspec.lock | 196 ++++++++++-------- demo/react-native-clock/android/build.gradle | 12 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../picovoice-rn-clock-app/build.gradle | 8 +- .../src/main/AndroidManifest.xml | 3 +- demo/react-native/android/build.gradle | 12 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../picovoice-rn-demo-app/build.gradle | 9 +- .../src/main/AndroidManifest.xml | 3 +- sdk/ios/README.md | 4 +- 26 files changed, 253 insertions(+), 233 deletions(-) diff --git a/README.md b/README.md index 25f9fd01d..d9549be51 100644 --- a/README.md +++ b/README.md @@ -1394,8 +1394,9 @@ picovoice.delete(); ``` ### iOS - + The Picovoice iOS SDK is available via [Cocoapods](https://cocoapods.org). To import it into your iOS project install Cocoapods and add the following line to your Podfile: + ```ruby pod 'Picovoice-iOS' diff --git a/demo/android/Activity/build.gradle b/demo/android/Activity/build.gradle index b82865ec6..56f710be5 100644 --- a/demo/android/Activity/build.gradle +++ b/demo/android/Activity/build.gradle @@ -1,6 +1,5 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. ext { - defaultTargetSdkVersion = 31 + defaultTargetSdkVersion = 33 } buildscript { @@ -9,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' } } @@ -20,6 +19,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/demo/android/Activity/gradle/wrapper/gradle-wrapper.properties b/demo/android/Activity/gradle/wrapper/gradle-wrapper.properties index f3b860b96..303dc5892 100644 --- a/demo/android/Activity/gradle/wrapper/gradle-wrapper.properties +++ b/demo/android/Activity/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/demo/android/Activity/picovoice-activity-demo-app/build.gradle b/demo/android/Activity/picovoice-activity-demo-app/build.gradle index bb7777cab..54c1ffcad 100644 --- a/demo/android/Activity/picovoice-activity-demo-app/build.gradle +++ b/demo/android/Activity/picovoice-activity-demo-app/build.gradle @@ -3,7 +3,7 @@ import groovy.json.JsonSlurper apply plugin: 'com.android.application' android { - compileSdkVersion defaultTargetSdkVersion + compileSdk defaultTargetSdkVersion defaultConfig { applicationId "ai.picovoice.picovoicedemo" @@ -96,6 +96,7 @@ android { } } } + namespace 'ai.picovoice.picovoicedemo' } dependencies { diff --git a/demo/android/Activity/picovoice-activity-demo-app/src/main/AndroidManifest.xml b/demo/android/Activity/picovoice-activity-demo-app/src/main/AndroidManifest.xml index cd8f8e574..d4af8b9a3 100644 --- a/demo/android/Activity/picovoice-activity-demo-app/src/main/AndroidManifest.xml +++ b/demo/android/Activity/picovoice-activity-demo-app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/demo/android/Service/build.gradle b/demo/android/Service/build.gradle index b82865ec6..56f710be5 100644 --- a/demo/android/Service/build.gradle +++ b/demo/android/Service/build.gradle @@ -1,6 +1,5 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. ext { - defaultTargetSdkVersion = 31 + defaultTargetSdkVersion = 33 } buildscript { @@ -9,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' } } @@ -20,6 +19,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/demo/android/Service/gradle/wrapper/gradle-wrapper.properties b/demo/android/Service/gradle/wrapper/gradle-wrapper.properties index cbe5d83fe..67f3d652e 100644 --- a/demo/android/Service/gradle/wrapper/gradle-wrapper.properties +++ b/demo/android/Service/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/demo/android/Service/picovoice-service-demo-app/build.gradle b/demo/android/Service/picovoice-service-demo-app/build.gradle index b112d8caa..b0ed30ccb 100644 --- a/demo/android/Service/picovoice-service-demo-app/build.gradle +++ b/demo/android/Service/picovoice-service-demo-app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion defaultTargetSdkVersion + compileSdk defaultTargetSdkVersion defaultConfig { applicationId "ai.picovoice.picovoicedemoservice" @@ -21,6 +21,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'ai.picovoice.picovoicedemoservice' } dependencies { diff --git a/demo/android/Service/picovoice-service-demo-app/src/main/AndroidManifest.xml b/demo/android/Service/picovoice-service-demo-app/src/main/AndroidManifest.xml index 2eccd69f4..098df7beb 100644 --- a/demo/android/Service/picovoice-service-demo-app/src/main/AndroidManifest.xml +++ b/demo/android/Service/picovoice-service-demo-app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/demo/flutter-clock/android/app/build.gradle b/demo/flutter-clock/android/app/build.gradle index c7083509e..7dbe8024d 100644 --- a/demo/flutter-clock/android/app/build.gradle +++ b/demo/flutter-clock/android/app/build.gradle @@ -22,15 +22,10 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } + compileSdk 33 lintOptions { disable 'InvalidPackage' @@ -40,7 +35,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.pico_clock" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -58,6 +53,3 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/demo/flutter-clock/android/build.gradle b/demo/flutter-clock/android/build.gradle index 82b42ced3..bae51ffb0 100644 --- a/demo/flutter-clock/android/build.gradle +++ b/demo/flutter-clock/android/build.gradle @@ -1,13 +1,11 @@ buildscript { - ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:7.4.2' } } @@ -26,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/demo/flutter-clock/android/gradle/wrapper/gradle-wrapper.properties b/demo/flutter-clock/android/gradle/wrapper/gradle-wrapper.properties index 5b74df172..b5618a594 100644 --- a/demo/flutter-clock/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo/flutter-clock/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/demo/flutter-clock/pubspec.lock b/demo/flutter-clock/pubspec.lock index e42680a45..56a635f9a 100644 --- a/demo/flutter-clock/pubspec.lock +++ b/demo/flutter-clock/pubspec.lock @@ -5,63 +5,64 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.18.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + url: "https://pub.dev" source: hosted version: "2.0.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" flutter: @@ -73,7 +74,8 @@ packages: dependency: "direct main" description: name: flutter_ringtone_player - url: "https://pub.dartlang.org" + sha256: "0b036416fda0654da52221989bd1a8ccd2876cea57f61ecc3a4fc272bd738c67" + url: "https://pub.dev" source: hosted version: "3.2.0" flutter_test: @@ -85,7 +87,8 @@ packages: dependency: transitive description: name: flutter_voice_processor - url: "https://pub.dartlang.org" + sha256: fb511a2f0ca9540c4b7c6715515389d27b5bbd332138ab3a300078fb243a0caf + url: "https://pub.dev" source: hosted version: "1.1.0" flutter_web_plugins: @@ -97,140 +100,152 @@ packages: dependency: "direct main" description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "474f7d506230897a3cd28c965ec21c5328ae5605fc9c400cd330e9e9d6ac175c" + url: "https://pub.dev" source: hosted version: "8.2.2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" - js: - dependency: transitive - description: - name: js - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.4" lints: dependency: "direct dev" description: name: lints - url: "https://pub.dartlang.org" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.10.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.3" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + url: "https://pub.dev" source: hosted version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + url: "https://pub.dev" source: hosted version: "2.0.27" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - url: "https://pub.dartlang.org" + sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7" + url: "https://pub.dev" source: hosted version: "2.2.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + url: "https://pub.dev" source: hosted version: "2.1.10" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + url: "https://pub.dev" source: hosted version: "2.0.6" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + url: "https://pub.dev" source: hosted version: "2.1.6" picovoice_flutter: dependency: "direct main" description: name: picovoice_flutter - url: "https://pub.dartlang.org" + sha256: "080d68022c0ae527e9fa154db67772752557279c11efdef31081d559181081d5" + url: "https://pub.dev" source: hosted version: "3.0.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted version: "2.1.4" porcupine_flutter: dependency: transitive description: name: porcupine_flutter - url: "https://pub.dartlang.org" + sha256: "54418cfc65172d56fd45deb246eb9f4ca1589f8d00c288e8eb9a0b4240d601f1" + url: "https://pub.dev" source: hosted version: "3.0.1" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" rhino_flutter: dependency: transitive description: name: rhino_flutter - url: "https://pub.dartlang.org" + sha256: "7ddd3ce716a64a63d038d2367c736032a3e1ca1d47579bfccbe57bdddc995b51" + url: "https://pub.dev" source: hosted version: "3.0.1" sky_engine: @@ -242,65 +257,82 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.6.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c" + url: "https://pub.dev" source: hosted version: "4.1.4" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + url: "https://pub.dev" source: hosted version: "1.0.0" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/demo/flutter/android/app/build.gradle b/demo/flutter/android/app/build.gradle index 51d56e3f5..4eb09ce1e 100644 --- a/demo/flutter/android/app/build.gradle +++ b/demo/flutter/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdk 33 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "ai.picovoice.flutter.picovoicedemo" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/demo/flutter/android/build.gradle b/demo/flutter/android/build.gradle index fab3c2e17..bae51ffb0 100644 --- a/demo/flutter/android/build.gradle +++ b/demo/flutter/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.4.2' } } @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/demo/flutter/android/gradle/wrapper/gradle-wrapper.properties b/demo/flutter/android/gradle/wrapper/gradle-wrapper.properties index 4a757e6d3..b5618a594 100644 --- a/demo/flutter/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo/flutter/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/demo/flutter/pubspec.lock b/demo/flutter/pubspec.lock index 33837ab7a..d613c156c 100644 --- a/demo/flutter/pubspec.lock +++ b/demo/flutter/pubspec.lock @@ -1,83 +1,70 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.11" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.16.0" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "1.18.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + url: "https://pub.dev" source: hosted version: "2.0.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" flutter: dependency: "direct main" description: flutter @@ -97,7 +84,8 @@ packages: dependency: transitive description: name: flutter_voice_processor - url: "https://pub.dartlang.org" + sha256: fb511a2f0ca9540c4b7c6715515389d27b5bbd332138ab3a300078fb243a0caf + url: "https://pub.dev" source: hosted version: "1.1.0" fuchsia_remote_debug_protocol: @@ -114,119 +102,136 @@ packages: dependency: "direct dev" description: name: lints - url: "https://pub.dartlang.org" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.10.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.3" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + url: "https://pub.dev" source: hosted version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + url: "https://pub.dev" source: hosted version: "2.0.27" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - url: "https://pub.dartlang.org" + sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7" + url: "https://pub.dev" source: hosted version: "2.2.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + url: "https://pub.dev" source: hosted version: "2.1.10" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + url: "https://pub.dev" source: hosted version: "2.0.6" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + url: "https://pub.dev" source: hosted version: "2.1.6" picovoice_flutter: dependency: "direct main" description: name: picovoice_flutter - url: "https://pub.dartlang.org" + sha256: "080d68022c0ae527e9fa154db67772752557279c11efdef31081d559181081d5" + url: "https://pub.dev" source: hosted version: "3.0.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted version: "2.1.4" porcupine_flutter: dependency: transitive description: name: porcupine_flutter - url: "https://pub.dartlang.org" + sha256: "54418cfc65172d56fd45deb246eb9f4ca1589f8d00c288e8eb9a0b4240d601f1" + url: "https://pub.dev" source: hosted version: "3.0.1" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" rhino_flutter: dependency: transitive description: name: rhino_flutter - url: "https://pub.dartlang.org" + sha256: "7ddd3ce716a64a63d038d2367c736032a3e1ca1d47579bfccbe57bdddc995b51" + url: "https://pub.dev" source: hosted version: "3.0.1" sky_engine: @@ -238,93 +243,106 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" sync_http: dependency: transitive description: name: sync_http - url: "https://pub.dartlang.org" + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.3.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.4.9" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.6.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 + url: "https://pub.dev" source: hosted - version: "8.2.2" + version: "11.10.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" webdriver: dependency: transitive description: name: webdriver - url: "https://pub.dartlang.org" + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.2" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c" + url: "https://pub.dev" source: hosted version: "4.1.4" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + url: "https://pub.dev" source: hosted version: "1.0.0" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.0.0" diff --git a/demo/react-native-clock/android/build.gradle b/demo/react-native-clock/android/build.gradle index 3ff5bd881..422af6cfd 100644 --- a/demo/react-native-clock/android/build.gradle +++ b/demo/react-native-clock/android/build.gradle @@ -1,20 +1,16 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext { - buildToolsVersion = "29.0.2" + buildToolsVersion = "30.0.3" minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 30 + compileSdkVersion = 33 + targetSdkVersion = 33 } repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.1.3") - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:7.4.2' } } diff --git a/demo/react-native-clock/android/gradle/wrapper/gradle-wrapper.properties b/demo/react-native-clock/android/gradle/wrapper/gradle-wrapper.properties index 0a3c01acb..f5b4feec6 100644 --- a/demo/react-native-clock/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo/react-native-clock/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Nov 22 11:58:01 PST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/demo/react-native-clock/android/picovoice-rn-clock-app/build.gradle b/demo/react-native-clock/android/picovoice-rn-clock-app/build.gradle index 18860ea35..262f742c6 100644 --- a/demo/react-native-clock/android/picovoice-rn-clock-app/build.gradle +++ b/demo/react-native-clock/android/picovoice-rn-clock-app/build.gradle @@ -122,7 +122,7 @@ def jscFlavor = 'org.webkit:android-jsc:+' def enableHermes = project.ext.react.get("enableHermes", false); android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -210,10 +210,4 @@ dependencies { } } -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.compile - into 'libs' -} apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/demo/react-native-clock/android/picovoice-rn-clock-app/src/main/AndroidManifest.xml b/demo/react-native-clock/android/picovoice-rn-clock-app/src/main/AndroidManifest.xml index 21eaf7f05..6863769fc 100644 --- a/demo/react-native-clock/android/picovoice-rn-clock-app/src/main/AndroidManifest.xml +++ b/demo/react-native-clock/android/picovoice-rn-clock-app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/demo/react-native/android/build.gradle b/demo/react-native/android/build.gradle index 3ff5bd881..8330d0707 100644 --- a/demo/react-native/android/build.gradle +++ b/demo/react-native/android/build.gradle @@ -1,20 +1,16 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext { - buildToolsVersion = "29.0.2" + buildToolsVersion = "30.0.3" minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 30 + compileSdkVersion = 33 + targetSdkVersion = 33 } repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.1.3") - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:7.4.2' } } diff --git a/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties b/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties index 54386ed36..1f22a4500 100644 --- a/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo/react-native/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Nov 19 10:48:38 PST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/demo/react-native/android/picovoice-rn-demo-app/build.gradle b/demo/react-native/android/picovoice-rn-demo-app/build.gradle index 6b9f762f8..35450ee53 100644 --- a/demo/react-native/android/picovoice-rn-demo-app/build.gradle +++ b/demo/react-native/android/picovoice-rn-demo-app/build.gradle @@ -121,7 +121,7 @@ def jscFlavor = 'org.webkit:android-jsc:+' def enableHermes = project.ext.react.get("enableHermes", false); android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -209,11 +209,4 @@ dependencies { } } -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.compile - into 'libs' -} - apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/demo/react-native/android/picovoice-rn-demo-app/src/main/AndroidManifest.xml b/demo/react-native/android/picovoice-rn-demo-app/src/main/AndroidManifest.xml index ede77da77..80e63309d 100644 --- a/demo/react-native/android/picovoice-rn-demo-app/src/main/AndroidManifest.xml +++ b/demo/react-native/android/picovoice-rn-demo-app/src/main/AndroidManifest.xml @@ -16,7 +16,8 @@ android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/sdk/ios/README.md b/sdk/ios/README.md index 67fbcf786..54cd938b9 100644 --- a/sdk/ios/README.md +++ b/sdk/ios/README.md @@ -17,9 +17,9 @@ Picovoice is: - **Cross-Platform:** Design once, deploy anywhere. Build using familiar languages and frameworks. ## Installation - + The Picovoice iOS SDK is available via [Cocoapods](https://cocoapods.org). To import it into your iOS project install Cocoapods and add the following line to your Podfile: - + ```ruby pod 'Picovoice-iOS' ```