Skip to content

Commit e5a827f

Browse files
authored
feat!: Capacitor 8 support (#311)
* feat!: Capacitor 8 support * revert types workaround * wip * revert ios 15.0 to 15.5 * wip * docs * docs * revert version bump * wip * revert
1 parent 2620a86 commit e5a827f

File tree

76 files changed

+1665
-1333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1665
-1333
lines changed

.changeset/wide-dogs-joke.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@capacitor-mlkit/barcode-scanning': major
3+
'@capacitor-mlkit/document-scanner': major
4+
'@capacitor-mlkit/face-detection': major
5+
'@capacitor-mlkit/face-mesh-detection': major
6+
'@capacitor-mlkit/selfie-segmentation': major
7+
'@capacitor-mlkit/subject-segmentation': major
8+
'@capacitor-mlkit/translation': major
9+
---
10+
11+
feat!: update to Capacitor 8 (see `BREAKING.md`)

package-lock.json

Lines changed: 1287 additions & 1116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
"affected:ios:pod:install": "turbo run ios:pod:install --affected --concurrency=1 --no-cache",
2727
"changeset": "changeset",
2828
"release": "npm run build && changeset publish",
29-
"release:preview": "pkg-pr-new publish './packages/*'"
29+
"release:preview": "pkg-pr-new publish './packages/*'",
30+
"postinstall": "patch-package"
3031
},
3132
"devDependencies": {
3233
"@changesets/cli": "2.29.8",
3334
"@robingenz/changelog-github": "0.0.1",
35+
"patch-package": "8.0.1",
3436
"pkg-pr-new": "0.0.20",
3537
"prettier-plugin-java": "2.6.7",
3638
"turbo": "2.6.3"

packages/barcode-scanning/BREAKING.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
# Breaking Changes
22

3-
This is a comprehensive list of the breaking changes introduced in the major version releases of Capacitor ML Kit Barcode Scanning plugin.
3+
This is a comprehensive list of the breaking changes introduced in the major version releases.
44

55
## Versions
66

7+
- [Version 8.x.x](#version-8xx)
78
- [Version 7.x.x](#version-7xx)
89
- [Version 6.x.x](#version-6xx)
910
- [Version 5.x.x](#version-5xx)
1011

12+
## Version 8.x.x
13+
14+
### Capacitor 8
15+
16+
This plugin now supports **Capacitor 8**. The minimum Android SDK version is **36**. Ensure your project meets these requirements before upgrading.
17+
1118
## Version 7.x.x
1219

1320
### Variables

packages/barcode-scanning/CapacitorMlkitBarcodeScanning.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '14.0'
14+
s.ios.deployment_target = '15.0'
1515
s.dependency 'Capacitor'
1616
s.dependency 'GoogleMLKit/BarcodeScanning', '7.0.0'
1717
s.swift_version = '5.1'

packages/barcode-scanning/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ Unofficial Capacitor plugin for [ML Kit Barcode Scanning](https://developers.goo
2020

2121
For a complete list of **supported barcodes**, see [BarcodeFormat](#barcodeformat).
2222

23+
## Compatibility
24+
25+
| Plugin Version | Capacitor Version | Status |
26+
| -------------- | ----------------- | -------------- |
27+
| 8.x.x | >=8.x.x | Active support |
28+
| 7.x.x | 7.x.x | Deprecated |
29+
| 6.x.x | 6.x.x | Deprecated |
30+
| 5.x.x | 5.x.x | Deprecated |
31+
2332
## Demo
2433

2534
A working example can be found here: [https://github.com/robingenz/capacitor-mlkit-plugin-demo](https://github.com/robingenz/capacitor-mlkit-plugin-demo)

packages/barcode-scanning/android/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
66
androidxCameraCamera2Version = project.hasProperty('androidxCameraCamera2Version') ? rootProject.ext.androidxCameraCamera2Version : '1.1.0'
77
androidxCameraCoreVersion = project.hasProperty('androidxCameraCoreVersion') ? rootProject.ext.androidxCameraCoreVersion : '1.1.0'
88
androidxCameraLifecycleVersion = project.hasProperty('androidxCameraLifecycleVersion') ? rootProject.ext.androidxCameraLifecycleVersion : '1.1.0'
@@ -17,18 +17,18 @@ buildscript {
1717
mavenCentral()
1818
}
1919
dependencies {
20-
classpath 'com.android.tools.build:gradle:8.7.2'
20+
classpath 'com.android.tools.build:gradle:8.13.0'
2121
}
2222
}
2323

2424
apply plugin: 'com.android.library'
2525

2626
android {
27-
namespace "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning"
28-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
27+
namespace = "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning"
28+
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
2929
defaultConfig {
30-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
31-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
30+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
31+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
3232
versionCode 1
3333
versionName "1.0"
3434
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,7 +40,7 @@ android {
4040
}
4141
}
4242
lintOptions {
43-
abortOnError false
43+
abortOnError = false
4444
}
4545
compileOptions {
4646
sourceCompatibility JavaVersion.VERSION_21
181 Bytes
Binary file not shown.

packages/barcode-scanning/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

packages/barcode-scanning/android/gradlew

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)