Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

java upgrades #138

Merged
merged 1 commit into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/android-demos.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions binding/ios/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
```
Expand Down
6 changes: 3 additions & 3 deletions demo/android/OctopusDemo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
defaultTargetSdkVersion = 31
defaultTargetSdkVersion = 33
}

buildscript {
Expand All @@ -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'
}
}

Expand All @@ -19,6 +19,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion demo/android/OctopusDemo/octopus-demo-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion defaultTargetSdkVersion
compileSdk defaultTargetSdkVersion

defaultConfig {
applicationId "ai.picovoice.octopusdemo"
Expand All @@ -21,6 +21,7 @@ android {
lint {
abortOnError false
}
namespace 'ai.picovoice.octopusdemo'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down