diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f9ce02e..40efc02a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: disable-animations: true profile: Nexus 5X emulator-options: -no-snapshot -no-window -no-boot-anim -camera-back emulated -camera-front emulated -gpu swiftshader_indirect - emulator-build: 6031357 + emulator-build: 611007 script: ./.github/workflows/emulator_script.sh - name: Upload emulator tests artifact uses: actions/upload-artifact@v1 diff --git a/cameraview/build.gradle b/cameraview/build.gradle index d2172aa0..b09317ea 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -145,7 +145,7 @@ bintray { // From official sample https://github.com/bintray/bintray-examples/blob/master/gradle-aar-example/build.gradle task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier.set('sources') from android.sourceSets.main.java.sourceFiles } @@ -167,7 +167,7 @@ task javadoc(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier.set('javadoc') from javadoc.destinationDir } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java index b7f7c972..f670c829 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java @@ -197,10 +197,7 @@ public class DeviceEncoders { public int compare(MediaCodecInfo o1, MediaCodecInfo o2) { boolean hw1 = isHardwareEncoder(o1.getName()); boolean hw2 = isHardwareEncoder(o2.getName()); - if (hw1 && hw2) return 0; - if (hw1) return -1; - if (hw2) return 1; - return 0; + return Boolean.compare(hw2, hw1); } }); }