Skip to content

Commit

Permalink
Bump library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Dushyanth Maguluru committed Feb 16, 2019
1 parent ffeaeaf commit 1f4cc67
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 22 deletions.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ buildscript {
repositories {
mavenCentral()
jcenter()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.3.1'
}
}

Expand All @@ -16,6 +17,8 @@ allprojects {
version = '1.9.8'

repositories {
google()
jcenter()
mavenCentral()
maven {
url 'https://oss.sonatype.org/content/groups/public'
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ ext {
}

dependencies {
compile libraries.support_v4
implementation libraries.support_v4
}
12 changes: 6 additions & 6 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ext.versions = [
compile_sdk : 25,
min_sdk : 9,
target_sdk : 25,
build_tools : "25.0.2",
support_lib : "25.3.1",
zxing : "3.3.0",
compile_sdk : 28,
min_sdk : 14,
target_sdk : 28,
build_tools : "28.0.3",
support_lib : "28.0.0",
zxing : "3.3.3",
barcodescanner: "1.9.8"
]

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Apr 08 11:44:39 MDT 2017
#Sat Feb 16 12:53:17 MST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
8 changes: 4 additions & 4 deletions zbar-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apply plugin: 'com.android.application'

dependencies {
//compile project(":zbar")
compile libraries.barcodescanner_zbar
compile libraries.support_v4
compile libraries.appcompat_v7
compile libraries.design_support
implementation libraries.barcodescanner_zbar
implementation libraries.support_v4
implementation libraries.appcompat_v7
implementation libraries.design_support
}

android {
Expand Down
4 changes: 2 additions & 2 deletions zbar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ ext {

dependencies {
//compile project(":core")
compile libraries.barcodescanner_core
compile fileTree(dir: 'libs', include: '*.jar')
implementation libraries.barcodescanner_core
implementation fileTree(dir: 'libs', include: '*.jar')
}
8 changes: 4 additions & 4 deletions zxing-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apply plugin: 'com.android.application'

dependencies {
//compile project(":zxing")
compile libraries.barcodescanner_zxing
compile libraries.support_v4
compile libraries.appcompat_v7
compile libraries.design_support
implementation libraries.barcodescanner_zxing
implementation libraries.support_v4
implementation libraries.appcompat_v7
implementation libraries.design_support
}

android {
Expand Down
4 changes: 2 additions & 2 deletions zxing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ ext {

dependencies {
//compile project(":core")
compile libraries.barcodescanner_core
compile libraries.zxing_core
implementation libraries.barcodescanner_core
implementation libraries.zxing_core
}

0 comments on commit 1f4cc67

Please sign in to comment.