Skip to content

Use Code Scanner and remove Zxing, bump versions #427

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

Merged
jperedadnr merged 2 commits into from
Jul 10, 2025
Merged

Use Code Scanner and remove Zxing, bump versions #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f683d36
Use Code Scanner and remove Zxing, bump versions
jperedadnr Jul 9, 2025
94ecc59
Remove unneeded license
jperedadnr Jul 10, 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
245 changes: 0 additions & 245 deletions LICENSE-zxing
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/android_project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.8.2'
classpath 'com.android.tools.build:gradle:8.11.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/android_project/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
26 changes: 2 additions & 24 deletions modules/barcode-scan/src/main/java/com/gluonhq/attach/barcodescan/BarcodeScanService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Gluon
* Copyright (c) 2016, 2025, Gluon
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -54,29 +54,7 @@
* when used.</p>
*
* <p><b>Android Configuration</b></p>
* <p>The permission <code>android.permission.CAMERA</code> needs to be added together
* with the following <code>activity</code> configuration that handles the SCAN intent
* of the BarcodeScanService.</p>
*
* <pre>
* {@code <manifest ...>
* <uses-permission android:name="android.permission.CAMERA"/>
* ...
* <application ...>
* ...
* <activity android:name="com.gluonhq.helloandroid.zxing.CaptureActivity"
* android:screenOrientation="sensorLandscape"
* android:clearTaskOnLaunch="true"
* android:stateNotNeeded="true"
* android:windowSoftInputMode="stateAlwaysHidden">
* <intent-filter>
* <action android:name="com.gluonhq.attach.barcodescan.android.SCAN"/>
* <category android:name="android.intent.category.DEFAULT"/>
* </intent-filter>
* </activity>
* <activity android:name="com.gluonhq.impl.attach.plugins.android.PermissionRequestActivity" />
* </application>
* </manifest>}</pre>
* <p>None</p>
*
* <p><b>iOS Configuration</b></p>
*
Expand Down
23 changes: 1 addition & 22 deletions ...ode-scan/src/main/java/com/gluonhq/attach/barcodescan/impl/AndroidBarcodeScanService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Gluon
* Copyright (c) 2016, 2025, Gluon
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -36,27 +36,6 @@

import java.util.Optional;

/**
* Requires this permission: android.permission.CAMERA
*
* And this activity added to the AndroidManifest.xml:
*
* <pre>
* {@code
* <activity android:name="com.gluonhq.helloandroid.zxing.CaptureActivity"
* android:screenOrientation="sensorLandscape"
* android:clearTaskOnLaunch="true"
* android:stateNotNeeded="true"
* android:windowSoftInputMode="stateAlwaysHidden">
* <intent-filter>
* <action android:name="com.gluonhq.attach.barcodescan.android.SCAN"/>
* <category android:name="android.intent.category.DEFAULT"/>
* </intent-filter>
* </activity>
* <activity android:name="com.gluonhq.helloandroid.PermissionRequestActivity" />
* }
* </pre>
*/
public class AndroidBarcodeScanService implements BarcodeScanService {

static {
Expand Down
Loading