From 7d8b5835692b7ff2e8c68f75ac0c8510a0afc652 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Mon, 28 Aug 2017 22:29:02 -0700 Subject: [PATCH] updated: - android gradle plugin to v3.0.0-beta3 - android-maven-gradle-plugin to v2.0 - lib version to v2.1.1-11 - added requirement on Google Play Services line in readme - updated usage info in readme - replaced publish block with common config file - replaced compile with implementation as per gradle 4.1 update --- README.md | 18 +++++++++++++++--- app/build.gradle | 8 ++++---- build.gradle | 8 ++++---- qreader/build.gradle | 42 +++--------------------------------------- 4 files changed, 26 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index d6ad0a0..d03e44d 100755 --- a/README.md +++ b/README.md @@ -15,14 +15,26 @@ Android library which makes use of Google's Mobile Vision API to enable reading The library is built for simplicity and ease of use. It not only eliminates most boilerplate code for dealing with setting up QR Code reading , but also provides an easy and simple API to retrieve information from QR Code quickly. +> Requires Google Play Services + # Changelog Starting with `1.0.4`, Changes exist in the [releases tab](https://github.com/nisrulz/qreader/releases). #Integration QREader is available in the Jcenter, so getting it as simple as adding it as a dependency -```gradle -compile 'com.github.nisrulz:qreader:{latest version}' -``` + +- For gradle version < 4.0 + + ```gradle + compile 'com.github.nisrulz:qreader:{latest version}' + ``` + +- For gradle 4.0+ + + ```gradle + implementation 'com.github.nisrulz:qreader:{latest version}' + ``` + where `{latest version}` corresponds to published version in [ ![Download](https://api.bintray.com/packages/nisrulz/maven/com.github.nisrulz%3Aqreader/images/download.svg) ](https://bintray.com/nisrulz/maven/com.github.nisrulz%3Aqreader/_latestVersion) diff --git a/app/build.gradle b/app/build.gradle index 6e8aa58..79631d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,9 +36,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' - compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion" - compile project(':qreader') + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion" + implementation project(':qreader') } diff --git a/build.gradle b/build.gradle index 5cc0871..18f56d5 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,14 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta2' + classpath 'com.android.tools.build:gradle:3.0.0-beta3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files // Required plugins added to classpath to facilitate pushing to Jcenter/Bintray classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' } } @@ -55,8 +55,8 @@ ext { playServicesVersion = '11.2.0' // Library Info - libVersionCode = 10 - libVersionName = '2.1.0' + libVersionCode = 11 + libVersionName = '2.1.1' libPomUrl = 'https://github.com/nisrulz/qreader' libGithubRepo = 'nisrulz/qreader' diff --git a/qreader/build.gradle b/qreader/build.gradle index fa431a5..00620e9 100644 --- a/qreader/build.gradle +++ b/qreader/build.gradle @@ -36,45 +36,9 @@ android { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' // Add Vision API - compile "com.google.android.gms:play-services-vision:$rootProject.ext.playServicesVersion" + implementation "com.google.android.gms:play-services-vision:$rootProject.ext.playServicesVersion" } -if (project.hasProperty('publish') && project.getProperty('publish')) { - // Bintray Params - ext { - bintrayRepo = 'maven' - bintrayName = rootProject.ext.libBintrayName - - publishedGroupId = GROUP - libraryName = rootProject.ext.libModuleName - artifact = rootProject.ext.libModuleName // Has to be same as your library module name - - libraryDescription = rootProject.ext.libModuleDesc - - // Your github repo link - siteUrl = rootProject.ext.libPomUrl - gitUrl = rootProject.ext.libPomUrl + '.git' - githubRepository = rootProject.ext.libGithubRepo - - libraryVersion = rootProject.ext.libVersionName - - developerId = POM_DEVELOPER_ID - developerName = POM_DEVELOPER_NAME - developerEmail = POM_DEVELOPER_EMAILID - - licenseName = POM_LICENCE_NAME - licenseUrl = POM_LICENCE_URL - allLicenses = [POM_ALL_LICENCES] - } - - // Place it at the end of the file - apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/installv1.gradle' - apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/bintrayv1.gradle' - - - javadoc { - failOnError = false - } -} \ No newline at end of file +apply from: 'https://raw.githubusercontent.com/nisrulz/JCenter/master/nishant-config.gradle'