java upgrades (#138)

Picovoice · Dec 22, 2023 · 09a24dc · 09a24dc
1 parent 17b2bde
commit 09a24dc
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 9 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: [ main ]
+    paths:
+      - '.github/workflows/android-demos.yml'
+      - 'demo/android/**'
+      - '!demo/android/OctopusDemo/README.md'
+  pull_request:
+    branches: [ main, 'v[0-9]+.[0-9]+' ]
+    paths:
+      - '.github/workflows/android-demos.yml'
+      - 'demo/android/**'
+      - '!demo/android/OctopusDemo/README.md'
+
+jobs:
+  build-octopus-demo:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: demo/android/OctopusDemo
+
+    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/binding/ios/README.md b/binding/ios/README.md
@@ -13,9 +13,9 @@ hypothesis (e.g. homophones)
 - iOS 13.0+
 
 ## Installation
-
+<!-- markdown-link-check-disable -->
 The Octopus iOS binding is available via [Cocoapods](https://cocoapods.org/pods/Octopus-iOS). To import it into your iOS project, add the following line to your Podfile:
-
+<!-- markdown-link-check-enable -->
 ```ruby
 pod 'Octopus-iOS'
 ```

diff --git a/demo/android/OctopusDemo/build.gradle b/demo/android/OctopusDemo/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    defaultTargetSdkVersion = 31
+    defaultTargetSdkVersion = 33
 }
 
 buildscript {
@@ -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/OctopusDemo/gradle/wrapper/gradle-wrapper.properties b/demo/android/OctopusDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 19 13:57:31 PDT 2023
 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/OctopusDemo/octopus-demo-app/build.gradle b/demo/android/OctopusDemo/octopus-demo-app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion defaultTargetSdkVersion
+    compileSdk defaultTargetSdkVersion
 
     defaultConfig {
         applicationId "ai.picovoice.octopusdemo"
@@ -21,6 +21,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'ai.picovoice.octopusdemo'
 }
 
 dependencies {

diff --git a/demo/android/OctopusDemo/octopus-demo-app/src/main/AndroidManifest.xml b/demo/android/OctopusDemo/octopus-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.octopusdemo">
+<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" />