diff --git a/.github/workflows/android-browserstack.yml b/.github/workflows/android-browserstack.yml index f8d4d431..2db9d452 100644 --- a/.github/workflows/android-browserstack.yml +++ b/.github/workflows/android-browserstack.yml @@ -36,18 +36,6 @@ jobs: - run: pip3 install requests - ############## REMOVE AFTER RELEASE ########################## - - name: Set up Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - - name: Build binding - run: ./gradlew assembleRelease --info - working-directory: binding/android/Orca - ############## REMOVE AFTER RELEASE ########################## - - name: set up JDK 17 uses: actions/setup-java@v3 with: @@ -106,18 +94,6 @@ jobs: - run: pip3 install requests - ############## REMOVE AFTER RELEASE ########################## - - name: Set up Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - - name: Build binding - run: ./gradlew assembleRelease --info - working-directory: binding/android/Orca - ############## REMOVE AFTER RELEASE ########################## - - name: set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/android-demos.yml b/.github/workflows/android-demos.yml index 6268b897..919c4a69 100644 --- a/.github/workflows/android-demos.yml +++ b/.github/workflows/android-demos.yml @@ -39,18 +39,6 @@ jobs: steps: - uses: actions/checkout@v3 - ############## REMOVE AFTER RELEASE ########################## - - name: Set up Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - - name: Build binding - run: ./gradlew assembleRelease --info - working-directory: binding/android/Orca - ############## REMOVE AFTER RELEASE ########################## - - name: Override gradle settings run: sed -i "s/com.android.tools.build:gradle:[0-9]*\.[0-9]*\.[0-9]*/com.android.tools.build:gradle:${{ matrix.agp-version }}/g" build.gradle diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index 3e799fd5..8ce66c63 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -43,18 +43,6 @@ jobs: - run: pip3 install requests - ############## REMOVE AFTER RELEASE ########################## - - name: Set up Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - - name: Build binding - run: ./gradlew assembleRelease --info - working-directory: binding/android/Orca - ############## REMOVE AFTER RELEASE ########################## - - name: set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/android-upload.yml b/.github/workflows/android-upload.yml index bd67fce6..329b71f8 100644 --- a/.github/workflows/android-upload.yml +++ b/.github/workflows/android-upload.yml @@ -23,18 +23,6 @@ jobs: steps: - uses: actions/checkout@v3 - ############## REMOVE AFTER RELEASE ########################## - - name: Set up Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'temurin' - - - name: Build binding - run: ./gradlew assembleRelease --info - working-directory: binding/android/Orca - ############## REMOVE AFTER RELEASE ########################## - - name: set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/binding/android/OrcaTestApp/orca-test-app/build.gradle b/binding/android/OrcaTestApp/orca-test-app/build.gradle index 9eebcad2..c11d79ba 100644 --- a/binding/android/OrcaTestApp/orca-test-app/build.gradle +++ b/binding/android/OrcaTestApp/orca-test-app/build.gradle @@ -115,8 +115,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.code.gson:gson:2.10' implementation 'com.google.errorprone:error_prone_annotations:2.36.0' -// implementation 'ai.picovoice:orca-android:1.2.0' - implementation files('../../Orca/orca/build/outputs/aar/orca-release.aar') + implementation 'ai.picovoice:orca-android:2.0.0' // Espresso UI Testing androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/demo/android/OrcaDemo/orca-demo-app/build.gradle b/demo/android/OrcaDemo/orca-demo-app/build.gradle index 3f10d3ec..8f74c666 100644 --- a/demo/android/OrcaDemo/orca-demo-app/build.gradle +++ b/demo/android/OrcaDemo/orca-demo-app/build.gradle @@ -113,8 +113,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' -// implementation 'ai.picovoice:orca-android:1.2.0' - implementation files('../../../../binding/android/Orca/orca/build/outputs/aar/orca-release.aar') + implementation 'ai.picovoice:orca-android:2.0.0' } afterEvaluate {