发布v3.4.0

jenly1314 · jenly1314 · commit 5887db04fbc3 · 2026-02-05T23:47:46.000+08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,13 +1,12 @@
 version: 2.1
 
 orbs:
-  android: circleci/android@3.0.0
+  android: circleci/android@3.2.0
 
 jobs:
   build:
     docker:
-      - image: cimg/android:2023.08
+      - image: cimg/android:2026.01.1
     steps:
       - checkout
-      - run:
-          command: ./gradlew build
+      - run: ./gradlew assembleDebug
diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version
@@ -0,0 +1 @@
+17
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,22 +7,26 @@ on:
     branches: [ master ]
 
 env:
-  JAVA_VERSION: 17
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Configure JDK
-        uses: actions/setup-java@v4
+      - name: Setup Java
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version-file: .github/workflows/.java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,7 +6,6 @@ on:
       - master
 
 env:
-  JAVA_VERSION: 17
   PYTHON_VERSION: 3.x
   GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
 
@@ -25,15 +24,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Configure JDK
-        uses: actions/setup-java@v4
+      - name: Setup Java
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version-file: .github/workflows/.java-version
 
       - name: Install Python
         uses: actions/setup-python@v5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,41 @@
+name: publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      confirm:
+        description: 'Publish to Maven Central? (yes/no)'
+        required: true
+        default: ''
+        type: string
+
+env:
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.confirm == 'yes' }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version-file: .github/workflows/.java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Upload Artifacts
+        run: ./gradlew clean publishAndReleaseToMavenCentral -PRELEASE_SIGNING_ENABLED=true --stacktrace
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY  }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## 版本日志
 
+#### v3.4.0：2026-2-5
+* 更新minSdk至23
+* 更新compileSdk至35
+* 更新CameraScan至v1.4.0
+* 更新zxing至v3.5.4
+* 更新Gradle至v8.13
+
 #### v3.3.0：2025-7-7
 * 迁移发布至 **Central Portal** [相关公告](https://central.sonatype.org/pages/ossrh-eol/#logging-in-to-central-portal)
 * 更新CameraScan至v1.3.1
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![JitPack](https://img.shields.io/jitpack/v/github/jenly1314/ZXingLite?logo=jitpack)](https://jitpack.io/#jenly1314/ZXingLite)
 [![CI](https://img.shields.io/github/actions/workflow/status/jenly1314/ZXingLite/build.yml?logo=github)](https://github.com/jenly1314/ZXingLite/actions/workflows/build.yml)
 [![Download](https://img.shields.io/badge/download-APK-brightgreen?logo=github)](https://raw.githubusercontent.com/jenly1314/ZXingLite/master/app/release/app-release.apk)
-[![API](https://img.shields.io/badge/API-21%2B-brightgreen?logo=android)](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels)
+[![API](https://img.shields.io/badge/API-23%2B-brightgreen?logo=android)](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels)
 [![License](https://img.shields.io/github/license/jenly1314/ZXingLite?logo=open-source-initiative)](https://opensource.org/licenses/apache-2-0)
 
 
@@ -35,19 +35,21 @@ ZXingLite for Android 是ZXing的精简极速版，基于ZXing库优化扫码和
 2. 在Module的 **build.gradle** 中添加依赖项
 
     ```gradle
-    implementation 'com.github.jenly1314:zxing-lite:3.3.0'
+    implementation 'com.github.jenly1314:zxing-lite:3.4.0'
 
     ```
 
 ### 温馨提示
 
 #### 关于ZXingLite版本与编译的SDK版本要求
 
-> 使用 **v3.1.x** 以上版本时，要求 **compileSdkVersion >= 34**
+> 使用 **v3.4.0** 及以上版本时，要求 **compileSdk ≥ 35**
 
-> 使用 **v3.0.x** 以上版本时，要求 **compileSdkVersion >= 33**
+> 使用 **v3.1.0** 及以上版本时，要求 **compileSdk ≥ 34**
 
-> 如果 **compileSdkVersion < 33** 请使用 [**v2.x版本**](https://github.com/jenly1314/ZXingLite/tree/2.x/)
+> 使用 **v3.0.0** 及以上版本时，要求 **compileSdk ≥ 33**
+
+> 如果 **compileSdk < 33** 请使用 [**v2.x版本**](https://github.com/jenly1314/ZXingLite/tree/2.x/)
 
 ## 使用
 
@@ -195,6 +197,8 @@ dependencies {
 
 > ZXingLite **v3.1.0** 以后版本（无需脱糖），因为zxing **v3.5.2** 又恢复了与旧版 JDK 的兼容性；详情见：[zxing-3.5.2](https://github.com/zxing/zxing/releases/tag/zxing-3.5.2)
 
+#### [常见问题解答](https://github.com/jenly1314/ZXingLite/issues/69#issue-529829908)
+
 ## 相关推荐
 
 - [MLKit](https://github.com/jenly1314/MLKit) 一个强大易用的工具包。通过ML Kit您可以很轻松的实现文字识别、条码识别、图像标记、人脸检测、对象检测等功能。
@@ -208,11 +212,12 @@ dependencies {
 
 ## 版本日志
 
-#### v3.3.0：2025-7-7
-* 迁移发布至 **Central Portal** [相关公告](https://central.sonatype.org/pages/ossrh-eol/#logging-in-to-central-portal)
-* 更新CameraScan至v1.3.1
-* 更新ViewfinderView至v1.4.0
-* 更新Gradle至v8.5
+#### v3.4.0：2026-2-5
+* 更新minSdk至23
+* 更新compileSdk至35
+* 更新CameraScan至v1.4.0
+* 更新zxing至v3.5.4
+* 更新Gradle至v8.13
 
 #### [查看更多版本日志](CHANGELOG.md)
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,14 +24,13 @@ android {
         }
     }
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
 }
@@ -45,7 +44,5 @@ dependencies {
     implementation deps.androidx.appcompat
     implementation deps.androidx.constraintlayout
 
-    coreLibraryDesugaring deps.desugar_jdk
-
     implementation project(':zxing-lite')
 }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,10 +11,27 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "3.3.0",
+      "versionCode": 44,
+      "versionName": "3.4.0",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 23
 }
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,9 @@ buildscript {
 }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.0' apply false
-    id 'com.android.library' version '8.2.0' apply false
+    id 'com.android.application' version '8.13.0' apply false
+    id 'com.android.library' version '8.13.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
     id 'org.jetbrains.dokka' version '1.9.20' apply false
-    id 'com.vanniktech.maven.publish' version '0.33.0' apply false
+    id 'com.vanniktech.maven.publish' version '0.34.0' apply false
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
-VERSION_NAME=3.3.0
-VERSION_CODE=43
+VERSION_NAME=3.4.0
+VERSION_CODE=44
 GROUP=com.github.jenly1314
 
 POM_DESCRIPTION=ZXingLite for Android
@@ -39,12 +39,7 @@ POM_DEVELOPER_ID=jenly
 POM_DEVELOPER_NAME=Jenly Yu
 POM_DEVELOPER_URL=https://github.com/jenly1314/
 
-SONATYPE_HOST=CENTRAL_PORTAL
-
-RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
-
-RELEASE_SIGNING_ENABLED=false
+mavenCentralPublishing=true
 
 
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -11,7 +11,7 @@ repo_name: ZXingLite
 repo_url: https://github.com/jenly1314/ZXingLite
 
 # Copyright
-copyright: 'Copyright &copy; 2016 - 2025 Jenly'
+copyright: 'Copyright &copy; 2016 - 2026 Jenly'
 
 # Configuration
 theme:
diff --git a/versions.gradle b/versions.gradle
@@ -1,24 +1,24 @@
 // App
 def app_version = [:]
-app_version.versionCode = 43
-app_version.versionName = "3.3.0"
+app_version.versionCode = 44
+app_version.versionName = "3.4.0"
 ext.app_version = app_version
 
 // build version
 def build_versions = [:]
-build_versions.minSdk = 21
-build_versions.targetSdk = 34
-build_versions.compileSdk = 34
-build_versions.buildTools = "34.0.0"
+build_versions.minSdk = 23
+build_versions.targetSdk = 35
+build_versions.compileSdk = 35
+build_versions.buildTools = "35.0.0"
 ext.build_versions = build_versions
 
 ext.deps = [:]
 
 // App dependencies
 def versions = [:]
 // AndroidX
-versions.material = "1.2.0"
-versions.appcompat = "1.1.0"
+versions.material = "1.13.0"
+versions.appcompat = "1.3.0"
 versions.constraintLayout = "2.0.4"
 
 // test
@@ -47,15 +47,12 @@ test.espresso = "androidx.test.espresso:espresso-core:$versions.espresso"
 deps.test = test
 
 // zxing
-deps.zxing = "com.google.zxing:core:3.5.3"
+deps.zxing = "com.google.zxing:core:3.5.4"
 
 // CameraScan
-deps.camera_scan = "com.github.jenly1314:camera-scan:1.3.1"
+deps.camera_scan = "com.github.jenly1314:camera-scan:1.4.0"
 // ViewfinderView
 deps.viewfinderview = "com.github.jenly1314:viewfinderview:1.4.0"
 
-// desugar_jdk
-deps.desugar_jdk = "com.android.tools:desugar_jdk_libs:1.2.3"
-
 ext.deps = deps
 
diff --git a/zxing-lite/build.gradle b/zxing-lite/build.gradle
@@ -28,10 +28,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    lintOptions {
+    lint {
         abortOnError false
     }
+
 }
 
 dependencies {
diff --git a/zxing-lite/src/main/java/com/king/zxing/util/CodeUtils.java b/zxing-lite/src/main/java/com/king/zxing/util/CodeUtils.java
@@ -719,5 +719,4 @@ private static Bitmap addCode(@Nullable Bitmap src, @Nullable String code, int t
         return bitmap;
     }
 
-
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,13 @@ android {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`compileOptions {`
`27`		`- coreLibraryDesugaringEnabled true`
`28`	`27`	`sourceCompatibility JavaVersion.VERSION_1_8`
`29`	`28`	`targetCompatibility JavaVersion.VERSION_1_8`
`30`	`29`	`}`
`31`	`30`	`kotlinOptions {`
`32`	`31`	`jvmTarget = JavaVersion.VERSION_1_8.toString()`
`33`	`32`	`}`
`34`		`- lintOptions {`
	`33`	`+ lint {`
`35`	`34`	`abortOnError false`
`36`	`35`	`}`
`37`	`36`	`}`
`@@ -45,7 +44,5 @@ dependencies {`
`45`	`44`	`implementation deps.androidx.appcompat`
`46`	`45`	`implementation deps.androidx.constraintlayout`
`47`	`46`
`48`		`- coreLibraryDesugaring deps.desugar_jdk`
`49`		`-`
`50`	`47`	`implementation project(':zxing-lite')`
`51`	`48`	`}`