Skip to content

Commit 528edd7

Browse files
authored
Merge pull request #126 from jquick-axway/MOD-2590
refactor(android): now downloads zxing jars via gradle
2 parents 19709a3 + ac1bfe8 commit 528edd7

File tree

9 files changed

+23
-36
lines changed

9 files changed

+23
-36
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ library 'pipeline-library'
33
def isMaster = env.BRANCH_NAME.equals('master')
44

55
buildModule {
6-
sdkVersion = '9.0.0.v20200205142057'
6+
sdkVersion = '9.0.0.GA'
77
iosLabels = 'osx && xcode-11 && appium' // need carthage which we install on appium nodes...
88
npmPublish = isMaster // By default it'll do github release on master anyways too
99
npmPublishArgs = '--access public --dry-run'

android/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
dependencies {
3+
implementation 'com.google.zxing:core:3.3.3'
4+
implementation 'com.google.zxing:android-core:3.3.0'
5+
implementation 'com.google.zxing:android-integration:3.3.0'
6+
}
-11.1 KB
Binary file not shown.
-10.7 KB
Binary file not shown.

android/lib/core-3.3.3.jar

-530 KB
Binary file not shown.

android/manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 5.0.0
5+
version: 5.0.1
66
apiversion: 4
77
architectures: arm64-v8a armeabi-v7a x86 x86_64
88
description: Lets you process 1D/2D barcodes.
99
author: Stephen Tramer & Jeff English
1010
license: Apache License, Version 2.0
11-
copyright: Copyright (c) 2010-2016 by Appcelerator, Inc.
11+
copyright: Copyright (c) 2010-2020 by Axway, Inc.
1212

1313

1414
# these should not be edited

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titanium-sdk/ti.barcode",
3-
"version": "5.0.0",
3+
"version": "5.0.1",
44
"description": "Lets you process 1D/2D barcodes",
55
"scripts": {
66
"commit": "git-cz",

test/unit/karma.unit.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = config => {
3434
}
3535
],
3636
titanium: {
37-
sdkVersion: config.sdkVersion || '8.2.1.GA'
37+
sdkVersion: config.sdkVersion || '9.0.0.GA'
3838
},
3939
customLaunchers: {
4040
android: {

0 commit comments

Comments
 (0)