Skip to content

Commit 152dc03

Browse files
committed
Update gradle, libraries, etc
1 parent f516764 commit 152dc03

File tree

19 files changed

+334
-475
lines changed

19 files changed

+334
-475
lines changed

.idea/codeStyles/Project.xml

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

.idea/compiler.xml

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

.idea/jarRepositories.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

barcode/build.gradle

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android-extensions'
32
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
4+
apply plugin: 'kotlin-kapt'
45
apply plugin: 'com.jfrog.bintray'
56
apply plugin: 'com.github.dcendents.android-maven'
67

@@ -17,30 +18,30 @@ final String CONFIG_TYPE_STRING = 'String'
1718
//noinspection GroovyUnusedAssignment
1819
final String CONFIG_LOGGING_ENABLED = 'LOGGING_ENABLED'
1920

20-
group "$rootProject.ext.coreGroupId"
21-
version = "$rootProject.ext.coreVersion"
21+
group "$coreGroupId"
22+
version = "$coreVersion"
2223

2324
ext {
2425
artifact = project.name
2526
libraryDescription = 'Barcode Module'
2627

27-
bintrayRepo = "$rootProject.ext.binTrayRepo"
28-
bintrayName = "$rootProject.ext.binTrayName"
29-
publishedGroupId = "$rootProject.ext.coreGroupId"
30-
libraryName = "$rootProject.ext.libraryName"
28+
bintrayRepo = "$binTrayRepo"
29+
bintrayName = "$binTrayName"
30+
publishedGroupId = "$coreGroupId"
31+
libraryName = "$libraryName"
3132

32-
libraryVersion = "$rootProject.ext.coreVersion"
33+
libraryVersion = "$coreVersion"
3334

34-
siteUrl = "$rootProject.ext.siteUrl"
35-
gitUrl = "$rootProject.ext.gitUrl"
35+
siteUrl = "$siteUrl"
36+
gitUrl = "$gitUrl"
3637

37-
developerId = "$rootProject.ext.developerId"
38-
developerName = "$rootProject.ext.developerName"
39-
developerEmail = "$rootProject.ext.developerEmail"
38+
developerId = "$developerId"
39+
developerName = "$developerName"
40+
developerEmail = "$developerEmail"
4041

41-
licenseName = "$rootProject.ext.licenseName"
42-
licenseUrl = "$rootProject.ext.licenseUrl"
43-
allLicenses = "$rootProject.ext.allLicenses"
42+
licenseName = "$licenseName"
43+
licenseUrl = "$licenseUrl"
44+
allLicenses = "$allLicenses"
4445

4546
}
4647

@@ -55,7 +56,7 @@ android {
5556

5657
consumerProguardFiles 'proguard-rules.pro'
5758

58-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
59+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
5960

6061
}
6162
buildTypes {
@@ -68,8 +69,8 @@ android {
6869
}
6970
}
7071

71-
dataBinding {
72-
enabled = true
72+
buildFeatures {
73+
dataBinding = true
7374
}
7475

7576

@@ -87,20 +88,20 @@ android {
8788

8889
dependencies {
8990
implementation fileTree(include: ['*.jar'], dir: 'libs')
90-
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion", {
91+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
9192
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
9293
})
9394

9495
// Timber logging util
95-
implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
96+
implementation "com.jakewharton.timber:timber:$timberVersion"
9697

9798
// Barcode Support
98-
implementation "com.google.zxing:core:$rootProject.ext.zxingCoreVersion"
99-
implementation "com.journeyapps:zxing-android-embedded:$rootProject.ext.zxingAndroidEmbeddedVersion"
99+
implementation "com.google.zxing:core:$zxingCoreVersion"
100+
implementation "com.journeyapps:zxing-android-embedded:$zxingAndroidEmbeddedVersion"
100101

101-
testImplementation "junit:junit:$rootProject.ext.junitVersion"
102-
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.androidTestVersion"
103-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.ext.kotlinVersion"
102+
testImplementation "junit:junit:$junitVersion"
103+
androidTestImplementation "androidx.test.ext:junit:$androidTestVersion"
104+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
104105
}
105106

106107
//Add these lines to publish library to bintray. This is the readymade scripts made by github user nuuneoi to make uploading to bintray easy.

barcode/proguard-rules.pro

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +0,0 @@
1-
-dontoptimize
2-
-dontobfuscate
3-
4-
# Prints some helpful hints, always add this option
5-
-verbose
6-
7-
-keepattributes SourceFile,LineNumberTable,Exceptions,InnerClasses,Signature,Deprecated,*Annotation*,EnclosingMethod
8-
9-
10-
# add all known-to-be-safely-shrinkable classes to the beginning of line below
11-
-keep class !androidx.legacy.**,!com.google.android.**,** { *; }
12-
13-
# Keep our interfaces so they can be used by other ProGuard rules.
14-
# See http://sourceforge.net/p/proguard/bugs/466/
15-
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
16-
-keep,allowobfuscation @interface com.facebook.soloader.DoNotOptimize
17-
18-
# Do not strip any method/class that is annotated with @DoNotStrip
19-
-keep @com.facebook.common.internal.DoNotStrip class *
20-
-keepclassmembers class * {
21-
@com.facebook.common.internal.DoNotStrip *;
22-
}
23-
24-
# Do not strip any method/class that is annotated with @DoNotOptimize
25-
-keep @com.facebook.soloader.DoNotOptimize class *
26-
-keepclassmembers class * {
27-
@com.facebook.soloader.DoNotOptimize *;
28-
}
29-
30-
# Keep native methods
31-
-keepclassmembers class * {
32-
native <methods>;
33-
}
34-
35-
-dontwarn okio.**
36-
-dontwarn com.squareup.okhttp.**
37-
-dontwarn okhttp3.**
38-
-dontwarn javax.annotation.**
39-
-dontwarn com.android.volley.toolbox.**
40-
-dontwarn com.facebook.infer.**

build.gradle

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,63 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
apply from: rootProject.file('dependencies.gradle')
54
ext {
65
sdkCompileVersion = 28
76
sdkMinVersion = 17
87
sdkTargetVersion = 28
9-
buildTools = '28.0.3'
8+
buildTools = '29.0.3'
9+
10+
coreVersion = '1.1.0'
11+
12+
coreGroupId = 'com.botnerd.core'
13+
14+
binTrayRepo = 'android-core'
15+
binTrayName = 'com.botnerd.core'
16+
libraryName = 'android-core'
17+
18+
siteUrl = 'https://github.com/botnerd/android-core'
19+
gitUrl = 'https://github.com/botnerd/android-core.git'
20+
21+
developerId = 'botnerd'
22+
developerName = 'Tim Judkins'
23+
developerEmail = '[email protected]'
24+
25+
licenseName = 'The Apache Software License, Version 2.0'
26+
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
27+
allLicenses = ["Apache-2.0"]
28+
29+
androidx_appcompat_version = '1.2.0'
30+
31+
googleServicesVersion = '4.2.0'
32+
33+
kotlinVersion = '1.4.10'
34+
navVersion = "2.0.0"
35+
36+
supportLibVersion = '1.0.2'
37+
legacySupportLibVersion = '1.0.0'
38+
materialLibVersion = '1.2.1'
39+
recyclerLibVersion = '1.1.0'
40+
browserLibVersion = '1.2.0'
41+
mediaLibVersion = '1.0.0'
42+
43+
// Networking
44+
retrofitVersion = '2.9.0'
45+
okhttpVersion = '4.9.0'
46+
okioVersion = '2.2.2'
47+
48+
// Image Loading
49+
frescoVersion = '2.3.0'
50+
51+
// Timber logging util
52+
timberVersion = '4.7.1'
53+
54+
// Barcode Support
55+
zxingCoreVersion = '3.4.1' // Higher versions support Android SDK 19+
56+
zxingAndroidEmbeddedVersion = '3.5.0'
57+
58+
junitVersion = '4.13.1'
59+
androidTestVersion = '1.1.2'
60+
espressoVersion = '3.1.0'
1061

1162
}
1263
repositories {
@@ -15,8 +66,8 @@ buildscript {
1566
mavenCentral()
1667
}
1768
dependencies {
18-
classpath 'com.android.tools.build:gradle:3.3.2'
19-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
69+
classpath 'com.android.tools.build:gradle:4.1.0'
70+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2071

2172
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
2273
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
@@ -34,10 +85,6 @@ allprojects {
3485
}
3586
}
3687

37-
subprojects {
38-
apply from: rootProject.file('dependencies.gradle')
39-
}
40-
4188
task clean(type: Delete) {
4289
delete rootProject.buildDir
4390
}

0 commit comments

Comments
 (0)