Skip to content
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

Release v4.0.2 #495

Merged
merged 4 commits into from
Sep 7, 2019
Merged

Release v4.0.2 #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d77fa29
Fix bintray publishing issues.
rkistner Sep 7, 2019
27c22e8
v4.0.1
rkistner Sep 7, 2019
c0c8363
More publishing fixes.
rkistner Sep 7, 2019
9349b31
v4.0.2.
rkistner Sep 7, 2019
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
6 changes: 5 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
### 4.0.0 (2019-09-07)
### 4.0.2 (2019-09-07)

* Use androidx.
* Use zxing:core 3.4.0 by default.
* Minimum SDK version 24.
* Fix ArithmeticException.
* Fix ResultPoint locations when camera is mirrored.

### 4.0.0 / 4.0.1 (2019-09-07)

* Broken release - use 4.0.2.

### 3.6.0 (2018-03-04)

* Use zxing:core 3.3.2 by default (#360).
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}
}

Expand All @@ -17,7 +17,7 @@ subprojects {
mavenLocal()
}

version = '4.0.0'
version = '4.0.2'
group = 'com.journeyapps'

ext.androidBuildTools = '28.0.3'
Expand Down
6 changes: 3 additions & 3 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 24
targetSdkVersion project.androidTargetSdk
versionCode 400
versionName "4.0.0"
versionCode 402
versionName "4.0.2"
}

def validConfig
Expand Down Expand Up @@ -60,7 +60,7 @@ android {

dependencies {
// If you use this from an external project, use the following instead:
// compile 'com.journeyapps:zxing-android-embedded:<version>'
// implementation 'com.journeyapps:zxing-android-embedded:<version>'
implementation project(':zxing-android-embedded')

implementation 'androidx.appcompat:appcompat:1.0.2'
Expand Down
14 changes: 6 additions & 8 deletions zxing-android-embedded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,11 @@ task sourceJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
}

publishing {
publications {
// We need this check to cover Android Studio gradle sync
if(project.tasks.findByPath('bundleRelease') != null) {
project.afterEvaluate {
publishing {
publications {
maven(MavenPublication) {
artifact bundleRelease
artifact bundleReleaseAar
artifactId project.artifactId

artifact sourceJar
Expand All @@ -81,16 +80,15 @@ publishing {
// remove this section.
def deps = asNode().appendNode('dependencies')

project.configurations.compile.allDependencies.each { dep ->
project.configurations.api.allDependencies.each { dep ->
def node = deps.appendNode('dependency')
node.appendNode('groupId', dep.group)
node.appendNode('artifactId', dep.name)
node.appendNode('version', dep.version)
node.appendNode('scope', 'compile')
node.appendNode('scope', 'api')
}

}

}
}
}
Expand Down