java upgrades (#343)

Picovoice · Dec 23, 2023 · 79b8fe3 · 79b8fe3
1 parent 6ccbb1b
commit 79b8fe3
Show file tree

Hide file tree

Showing 15 changed files with 170 additions and 116 deletions.
diff --git a/.github/workflows/android-demos.yml b/.github/workflows/android-demos.yml
@@ -0,0 +1,35 @@
+name: Android Demos
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/android-demos.yml'
+      - 'demo/android/**'
+      - '!demo/android/LeopardDemo/README.md'
+  pull_request:
+    branches: [ master, 'v[0-9]+.[0-9]+' ]
+    paths:
+      - '.github/workflows/android-demos.yml'
+      - 'demo/android/**'
+      - '!demo/android/LeopardDemo/README.md'
+
+jobs:
+  build-leopard-demo:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: demo/android/LeopardDemo
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+
+    - name: Build
+      run: ./gradlew assembleDebug
diff --git a/README.md b/README.md
@@ -362,9 +362,9 @@ Replace `${ACCESS_KEY}` with yours obtained from Picovoice Console, `${MODEL_FIL
 Finally, when done be sure to release resources acquired using `pv_leopard_delete(leopard)`.
 
 ### iOS
-
+<!-- markdown-link-check-disable -->
 The Leopard iOS binding is available via [CocoaPods](https://cocoapods.org/pods/Leopard-iOS). To import it into your iOS project, add the following line to your Podfile and run `pod install`:
-
+<!-- markdown-link-check-enable -->
 ```ruby
 pod 'Leopard-iOS'
 ```

diff --git a/binding/ios/README.md b/binding/ios/README.md
@@ -17,8 +17,9 @@ Leopard is an on-device speech-to-text engine. Leopard is:
 
 ## Installation
 
+<!-- markdown-link-check-disable -->
 The Leopard iOS binding is available via [CocoaPods](https://cocoapods.org/pods/Leopard-iOS). To import it into your iOS project, add the following line to your Podfile:
-
+<!-- markdown-link-check-enable -->
 ```ruby
 pod 'Leopard-iOS'
 ```

diff --git a/demo/android/LeopardDemo/build.gradle b/demo/android/LeopardDemo/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -19,6 +19,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/demo/android/LeopardDemo/gradle/wrapper/gradle-wrapper.properties b/demo/android/LeopardDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jun 29 23:02:09 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-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/android/LeopardDemo/leopard-demo-app/build.gradle b/demo/android/LeopardDemo/leopard-demo-app/build.gradle
@@ -1,7 +1,9 @@
+import groovy.json.JsonSlurper
+
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion defaultTargetSdkVersion
+    compileSdk defaultTargetSdkVersion
 
     defaultConfig {
         applicationId "ai.picovoice.leoparddemo"
@@ -20,7 +22,7 @@ android {
     }
 
     def testDataFile = file('../../../../resources/.test/test_data.json')
-    def parsedJson = new groovy.json.JsonSlurper().parseText(testDataFile.text)
+    def parsedJson = new JsonSlurper().parseText(testDataFile.text)
     def languages = []
     parsedJson.tests.parameters.each { a ->
         languages.add(a.language)
@@ -63,6 +65,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'ai.picovoice.leoparddemo'
 }
 
 dependencies {

diff --git a/demo/android/LeopardDemo/leopard-demo-app/src/main/AndroidManifest.xml b/demo/android/LeopardDemo/leopard-demo-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ai.picovoice.leoparddemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

diff --git 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.leoparddemo"
         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
@@ -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
@@ -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