Skip to content
This repository was archived by the owner on Apr 16, 2025. It is now read-only.

Commit c6adcbe

Browse files
authored
Android and Gradle generation testing for demos (#153)
1 parent 531505e commit c6adcbe

File tree

4 files changed

+43
-6
lines changed

4 files changed

+43
-6
lines changed

.github/workflows/android-demos.yml

+26-3
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,41 @@ on:
1818
jobs:
1919
build-octopus-demo:
2020
runs-on: ubuntu-latest
21+
strategy:
22+
matrix:
23+
java-version: [11, 17, 21]
24+
include:
25+
- java-version: 11
26+
gradle-version: 6.5
27+
agp-version: 4.1.3
28+
- java-version: 17
29+
gradle-version: 7.5
30+
agp-version: 7.4.2
31+
- java-version: 21
32+
gradle-version: 8.5
33+
agp-version: 8.2.2
34+
2135
defaults:
2236
run:
2337
working-directory: demo/android/OctopusDemo
2438

2539
steps:
2640
- uses: actions/checkout@v3
41+
2742

28-
- name: set up JDK 17
43+
- name: Override gradle settings
44+
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
45+
46+
- name: set up JDK ${{ matrix.java-version }}
2947
uses: actions/setup-java@v3
3048
with:
31-
java-version: '17'
49+
java-version: ${{ matrix.java-version }}
3250
distribution: 'temurin'
51+
52+
- name: Use Gradle ${{ matrix.gradle-version }}
53+
uses: gradle/actions/setup-gradle@v3
54+
with:
55+
gradle-version: ${{ matrix.gradle-version }}
3356

3457
- name: Build
35-
run: ./gradlew assembleDebug
58+
run: gradle assembleDebug

demo/android/OctopusDemo/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1515
# Android operating system, and which are packaged with your app"s APK
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1717
android.useAndroidX=true
18+
android.nonTransitiveRClass=false
19+

demo/android/OctopusDemo/octopus-demo-app/build.gradle

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.application'
22
android {
3+
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
34
compileSdk defaultTargetSdkVersion
45

56
defaultConfig {
@@ -18,10 +19,20 @@ android {
1819
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1920
}
2021
}
21-
lint {
22+
23+
buildFeatures {
24+
buildConfig true
25+
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
lintOptions {
2231
abortOnError false
2332
}
24-
namespace 'ai.picovoice.octopusdemo'
33+
if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
34+
namespace 'ai.picovoice.octopusdemo'
35+
}
2536
}
2637

2738
dependencies {

demo/android/OctopusDemo/octopus-demo-app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="ai.picovoice.octopusdemo">
34

45
<uses-permission android:name="android.permission.INTERNET" />
56
<uses-permission android:name="android.permission.RECORD_AUDIO" />

0 commit comments

Comments
 (0)