Skip to content

Commit 9c230a6

Browse files
Merge branch 'chore/RMET-4678/up-gradle-dep' of github.com:ionic-team/capacitor-barcode-scanner into chore/RMET-4678/up-gradle-dep
2 parents 726f910 + 654887f commit 9c230a6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

example-app/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
namespace "io.ionic.starter"
5-
compileSdk rootProject.ext.compileSdkVersion
4+
namespace = "io.ionic.starter"
5+
compileSdk = rootProject.ext.compileSdkVersion
66
defaultConfig {
77
applicationId "io.ionic.starter"
88
minSdkVersion rootProject.ext.minSdkVersion
@@ -13,7 +13,7 @@ android {
1313
aaptOptions {
1414
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
1515
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
16-
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
16+
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
1717
}
1818
}
1919
buildTypes {

plugin/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
namespace "com.capacitorjs.barcodescanner"
29-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
28+
namespace = "com.capacitorjs.barcodescanner"
29+
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
3030
defaultConfig {
3131
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26
3232
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
@@ -41,7 +41,7 @@ android {
4141
}
4242
}
4343
lintOptions {
44-
abortOnError false
44+
abortOnError = false
4545
}
4646
compileOptions {
4747
sourceCompatibility JavaVersion.VERSION_21

0 commit comments

Comments
 (0)