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.

Sign up for GitHub

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

Upgrade CoAT to use jdk 17 #2268

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Upgrade CoAT to use jdk 17 #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
steps:
- uses: kaidokert/[email protected]
timeout-minutes: 30
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 #v1.0.6
- name: Build with Gradle
Expand Down
8 changes: 5 additions & 3 deletions docker/linux/android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ ARG FROM_IMAGE
FROM ${FROM_IMAGE:-cobalt-build-base}

# TODO: b/309157124 - add --no-install-recommends.
RUN apt update -qqy \
&& apt install -qqy \
RUN apt update -qqy
RUN apt -y install wget curl
RUN wget https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.deb
RUN apt install -qqy \
libxml2-dev \
default-jdk \
./jdk-17_linux-x64_bin.deb \
binutils-arm-linux-gnueabi \
g++-multilib \
&& /opt/clean-after-apt.sh
Expand Down
5 changes: 3 additions & 2 deletions starboard/android/apk/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ ext {
println "TARGET: ${cobaltTarget}"

android {
namespace "dev.cobalt.coat"
compileSdkVersion 'android-31'
buildToolsVersion '31.0.0'
ndkVersion NDK_VERSION

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

aaptOptions {
Expand Down
3 changes: 1 addition & 2 deletions starboard/android/apk/app/src/app/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.cobalt.coat">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-feature android:name="android.hardware.microphone" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false"/>
Expand Down
Loading