Bump to 1.9.13

dm77 · Feb 17, 2019 · 8d5d347 · 8d5d347
1 parent 1f4cc67
commit 8d5d347
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.9.13] - February  16, 2019
+* Update plugin, build tools and library versions
+* Min SDK version is now 14
+* Upload artifacts to jcenter/bintray instead of Maven central/Sonatype
+
 ## [1.9.8] - August 18, 2017
 * One more attempt to fix Nexus 5x portrait scanning problems
 

diff --git a/README.md b/README.md
@@ -25,7 +25,12 @@ Installation
 
 Add the following dependency to your build.gradle file.
 
-`compile 'me.dm7.barcodescanner:zxing:1.9.8'`
+```
+repositories {
+   jcenter()
+}
+implementation 'me.dm7.barcodescanner:zxing:1.9.13'
+```
 
 Simple Usage
 ------------
@@ -137,7 +142,12 @@ Installation
 
 Add the following dependency to your build.gradle file.
 
-`compile 'me.dm7.barcodescanner:zbar:1.9.8'`
+```
+repositories {
+   jcenter()
+}
+implementation 'me.dm7.barcodescanner:zbar:1.9.13'
+```
 
 Simple Usage
 ------------

diff --git a/build.gradle b/build.gradle
@@ -2,27 +2,24 @@ apply from: 'dependencies.gradle'
 
 buildscript {
     repositories {
-        mavenCentral()
         jcenter()
         google()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 allprojects {
     group = 'me.dm7.barcodescanner'
-    version = '1.9.8'
+    version = '1.9.13'
 
     repositories {
         google()
         jcenter()
-        mavenCentral()
-        maven {
-            url 'https://oss.sonatype.org/content/groups/public'
-        }
     }
 
     ext {
@@ -47,35 +44,24 @@ subprojects {
                 defaultConfig {
                     minSdkVersion versions.min_sdk
                     targetSdkVersion versions.target_sdk
-                    versionCode 198
-                    versionName "1.9.8"
+                    versionCode 1913
+                    versionName "1.9.13"
                 }
             }
         }
-        if(project.isLibrary && rootProject.hasProperty('sonatypeUsername') && rootProject.hasProperty('sonatypePassword')) {
-            configure(project) {
-                apply plugin: 'maven'
-                apply plugin: 'signing'
-
-                signing {
-                    required { gradle.taskGraph.hasTask("uploadArchives") }
-                    sign configurations.archives
-                }
-
-                uploadArchives {
-                    repositories.mavenDeployer {
-                        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                        repository(url: sonatypeRepo) {
-                            authentication(userName: sonatypeUsername , password: sonatypePassword)
-                            releases(updatePolicy: 'always')
-                        }
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+        def bintrayUser = properties.getProperty('bintray.user')
+        def bintrayApikey = properties.getProperty('bintray.apikey')
 
-                        snapshotRepository(url: sonatypeSnapshotRepo) {
-                            authentication(userName: sonatypeUsername , password: sonatypePassword)
-                            snapshots(updatePolicy: 'always')
-                        }
+        if(project.isLibrary && bintrayUser?.trim() && bintrayApikey?.trim()) {
+            configure(project) {
+                apply plugin: 'com.github.dcendents.android-maven'
+                group = project.group                               // Maven Group ID for the artifact
 
+                install {
+                    repositories.mavenInstaller {
                         pom.project {
                             name project.pomName
                             version project.version
@@ -109,11 +95,55 @@ subprojects {
                         }
                     }
                 }
+
+                apply plugin: 'com.jfrog.bintray'
+
+                version = '1.9.13'
+
+                if (project.hasProperty("android")) { // Android libraries
+                    task sourcesJar(type: Jar) {
+                        classifier = 'sources'
+                        from android.sourceSets.main.java.srcDirs
+                    }
+                } else { // Java libraries
+                    task sourcesJar(type: Jar, dependsOn: classes) {
+                        classifier = 'sources'
+                        from sourceSets.main.allSource
+                    }
+                }
+
+
+                artifacts {
+                    archives sourcesJar
+                }
+
+                bintray {
+                    user = properties.getProperty("bintray.user")
+                    key = properties.getProperty("bintray.apikey")
+
+                    configurations = ['archives']
+                    pkg {
+                        repo = 'maven'
+                        name = 'me.dm7.barcodescanner:' + project.pomArtifactId
+                        desc = 'Barcode Scanner Libraries for Android'
+                        websiteUrl = 'https://github.com/dm77/barcodescanner'
+                        vcsUrl = 'https://github.com/dm77/barcodescanner.git'
+                        licenses = ["Apache-2.0"]
+                        publish = true
+                        publicDownloadNumbers = true
+                        version {
+                            desc = 'Barcode Scanner Libraries for Android'
+                            gpg {
+                                sign = false
+                            }
+                        }
+                    }
+                }
             }
         }
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.4.1'
+    gradleVersion = '4.10.1'
 }
diff --git a/core/src/main/java/me/dm7/barcodescanner/core/BarcodeScannerView.java b/core/src/main/java/me/dm7/barcodescanner/core/BarcodeScannerView.java
@@ -1,14 +1,12 @@
 package me.dm7.barcodescanner.core;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.hardware.Camera;
 import android.support.annotation.ColorInt;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.FrameLayout;

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,7 +5,7 @@ ext.versions = [
         build_tools   : "28.0.3",
         support_lib   : "28.0.0",
         zxing         : "3.3.3",
-        barcodescanner: "1.9.8"
+        barcodescanner: "1.9.13"
 ]
 
 ext.libraries = [

diff --git a/zbar-sample/build.gradle b/zbar-sample/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    //compile project(":zbar")
+//    implementation project(":zbar")
     implementation libraries.barcodescanner_zbar
     implementation libraries.support_v4
     implementation libraries.appcompat_v7

diff --git a/zbar/build.gradle b/zbar/build.gradle
@@ -9,7 +9,7 @@ ext {
 }
 
 dependencies {
-    //compile project(":core")
-    implementation libraries.barcodescanner_core
-    implementation fileTree(dir: 'libs', include: '*.jar')
+//    api project(":core")
+    api libraries.barcodescanner_core
+    api fileTree(dir: 'libs', include: '*.jar')
 }
diff --git a/zxing-sample/build.gradle b/zxing-sample/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    //compile project(":zxing")
+//    implementation project(":zxing")
     implementation libraries.barcodescanner_zxing
     implementation libraries.support_v4
     implementation libraries.appcompat_v7

diff --git a/zxing/build.gradle b/zxing/build.gradle
@@ -9,7 +9,7 @@ ext {
 }
 
 dependencies {
-    //compile project(":core")
-    implementation libraries.barcodescanner_core
-    implementation libraries.zxing_core
+//    api project(":core")
+    api libraries.barcodescanner_core
+    api libraries.zxing_core
 }