Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f822d7a
Add workflow_dispatch trigger to workflows from GitHub
cartland Apr 17, 2025
fae1075
Update build workflow to use ubuntu-20.04
cartland May 5, 2025
a2ca109
Update build workflow to use ubuntu-latest
cartland May 5, 2025
01f6746
Upgrade actions/upload-artifact@v3
cartland May 5, 2025
e95d9e9
Upgrade actions/checkout@v4
cartland May 5, 2025
f5a5c2b
Upgrade actions/upload-artifact@v4
cartland May 5, 2025
3532009
Upgrade gradle to 8.9 and JDK to 17
cartland Jul 10, 2025
1a0bbd9
Update build workflow: set up JDK 11
cartland Jul 10, 2025
7f2df5d
Revert JDK version to 1.8 for Camera2Basic
cartland Jul 10, 2025
d9d6ebc
Add .java-version files to specify java versions
cartland Jul 10, 2025
4b65514
Prepare for JDK versions in CI
cartland Jul 10, 2025
f393847
CI / no CI
cartland Jul 10, 2025
3c95f2a
Add CI Java Version check
cartland Jul 10, 2025
895535e
Log java homes in CI
cartland Jul 10, 2025
a630e95
gradlew_recursive.sh java -version
cartland Jul 11, 2025
3a872c4
Fix: Update HdrViewfinder to build with modern tools
cartland Jul 11, 2025
23a4f62
Refactor: Split android.yml into per-module workflow jobs
cartland Jul 11, 2025
f7ddaee
Refactor: Update android.yml workflow jobs
cartland Jul 11, 2025
e9bec61
Refactor: Update artifact upload names in android.yml
cartland Jul 11, 2025
9fa606b
Revert HdrViewfinder
cartland Jul 11, 2025
453fb8e
Fix: Update Gradle Wrapper in HdrViewfinder
cartland Jul 11, 2025
830810c
Revert HdrViewfinder
cartland Jul 11, 2025
803a89a
Refactor: Remove HdrViewfinder workflow job
cartland Jul 11, 2025
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
25 changes: 0 additions & 25 deletions .github/scripts/gradlew_recursive.sh

This file was deleted.

212 changes: 201 additions & 11 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,220 @@
name: Android CI

on:
workflow_dispatch:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:

build:
name: Build
runs-on: ubuntu-18.04

camerax_basic:
name: CameraXBasic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: CameraXBasic
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraXBasic
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camerax_basic_assemble
path: CameraXBasic/assemble.zip
camerax_extensions:
name: CameraXExtensions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: CameraXExtensions
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraXExtensions
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camerax_extensions_assemble
path: CameraXExtensions/assemble.zip
camerax_video:
name: CameraXVideo
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: CameraXVideo
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraXVideo
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camerax_video_assemble
path: CameraXVideo/assemble.zip
camerax_advanced:
name: CameraXAdvanced
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: CameraXAdvanced
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraXAdvanced
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camerax_advanced_assemble
path: CameraXAdvanced/assemble.zip
camerax_mlkit:
name: CameraX-MLKit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: CameraX-MLKit
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraX-MLKit
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camerax_mlkit_assemble
path: CameraX-MLKit/assemble.zip
camera2_basic:
name: Camera2Basic
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: Camera2Basic
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: Camera2Basic
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camera2_basic_assemble
path: Camera2Basic/assemble.zip
camera2_extensions:
name: Camera2Extensions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: Camera2Extensions
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: Camera2Extensions
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camera2_extensions_assemble
path: Camera2Extensions/assemble.zip
camera2_video:
name: Camera2Video
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- name: Build project
working-directory: Camera2Video
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: Camera2Video
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camera2_video_assemble
path: Camera2Video/assemble.zip
camera2_slowmotion:
name: Camera2SlowMotion
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 11
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
- name: Build project
working-directory: Camera2SlowMotion
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: Camera2SlowMotion
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: camera2_slowmotion_assemble
path: Camera2SlowMotion/assemble.zip
camerautils:
name: CameraUtils
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
- name: Build project
run: .github/scripts/gradlew_recursive.sh assembleDebug
working-directory: CameraUtils
run: ./gradlew assembleDebug
- name: Zip artifacts
working-directory: CameraUtils
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
- name: Upload artifacts
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: assemble
path: assemble.zip
name: camerautils_assemble
path: CameraUtils/assemble.zip
1 change: 1 addition & 0 deletions .github/workflows/copy-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ name: Duplicates main to old master branch
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the main branch
on:
workflow_dispatch:
push:
branches: [ main ]

Expand Down
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
1 change: 1 addition & 0 deletions Camera2Basic/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
14 changes: 11 additions & 3 deletions Camera2Basic/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ apply plugin: 'kotlin-kapt'
apply plugin: "androidx.navigation.safeargs"

android {
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
buildFeatures {
viewBinding true
}
namespace "com.example.android.camera2.basic"
compileSdk 34
defaultConfig {
Expand All @@ -32,12 +38,12 @@ android {
}

compileOptions {
sourceCompatibility rootProject.ext.java_version
targetCompatibility rootProject.ext.java_version
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "$rootProject.ext.java_version"
jvmTarget = "17"
}

buildTypes {
Expand All @@ -53,6 +59,8 @@ android {
}
}



dependencies {
implementation project(':utils')

Expand Down
1 change: 1 addition & 0 deletions Camera2SlowMotion/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11
1 change: 1 addition & 0 deletions CameraUtils/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11
1 change: 1 addition & 0 deletions CameraXExtensions/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#Wed Aug 03 16:12:29 EDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
1 change: 1 addition & 0 deletions HdrViewfinder/.java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11