Skip to content

Commit 6328fff

Browse files
mateuszdrzazgamateuszdrzazga
authored
Merge pull request #29 from mateuszdrzazga/feature/dependency-cleanup
Feature/dependency cleanup
2 parents fad1dfd + 2b1d527 commit 6328fff

File tree

3 files changed

+106
-63
lines changed

3 files changed

+106
-63
lines changed

‎OpenScienceJournal/app/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ android {
5353
}
5454

5555
dependencies {
56-
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
56+
annotationProcessor deps.daggerCompiler
5757

58-
implementation 'androidx.core:core:1.5.0-alpha02'
59-
implementation 'androidx.appcompat:appcompat:1.2.0'
58+
implementation deps.core
59+
implementation deps.appCompat
6060

61-
implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
62-
implementation("com.google.guava:guava:$guavaVersion") {
61+
implementation deps.rxJava
62+
implementation(deps.guava) {
6363
// Avoid error "Program type already present: javax.annotation.CheckForNull"
6464
exclude group: 'com.google.code.findbugs'
6565
// Avoid error "Program type already present: org.checkerframework.checker.nullness.compatqual.NullableType"
@@ -69,34 +69,34 @@ dependencies {
6969
// Avoid error "Program type already present: org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement"
7070
exclude group: 'org.codehaus.mojo'
7171
}
72-
implementation('com.google.android.gms:play-services-auth:17.0.0') {
72+
implementation(deps.playServicesAuth) {
7373
// Avoid error "Program type already present: com.google.common.annotations.Beta".
7474
exclude group: 'com.google.guava'
7575
// Avoid error "Program type already present: javax.annotation.CheckForNull"
7676
exclude group: 'com.google.code.findbugs'
7777
// Avoid error "Program type already present: com.google.j2objc.annotations.AutoreleasePool"
7878
exclude group: 'com.google.j2objc'
7979
}
80-
implementation('com.google.api-client:google-api-client-android:1.25.0') {
80+
implementation(deps.googleApiClient) {
8181
// Avoid error "Program type already present: com.google.common.annotations.Beta".
8282
exclude group: 'com.google.guava'
8383
// Avoid error "Program type already present: javax.annotation.CheckForNull"
8484
exclude group: 'com.google.code.findbugs'
8585
// Avoid error "Program type already present: com.google.j2objc.annotations.AutoreleasePool"
8686
exclude group: 'com.google.j2objc'
8787
}
88-
implementation('com.google.apis:google-api-services-drive:v2-rev362-1.25.0') {
88+
implementation(deps.driveApi) {
8989
// Avoid error "Program type already present: com.google.common.annotations.Beta".
9090
exclude group: 'com.google.guava'
9191
// Avoid error "Program type already present: javax.annotation.CheckForNull"
9292
exclude group: 'com.google.code.findbugs'
9393
// Avoid error "Program type already present: com.google.j2objc.annotations.AutoreleasePool"
9494
exclude group: 'com.google.j2objc'
9595
}
96-
implementation "com.google.dagger:dagger:$daggerVersion"
97-
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
96+
implementation deps.dagger
97+
implementation deps.protobufLite
9898

9999
implementation project(':whistlepunk_library')
100100

101-
testImplementation "junit:junit:$junitVersion"
101+
testImplementation deps.junit
102102
}

‎OpenScienceJournal/whistlepunk_library/build.gradle‎

Lines changed: 43 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -110,36 +110,42 @@ protobuf {
110110
}
111111

112112
dependencies {
113-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
114-
androidTestImplementation("junit:junit:$junitVersion") {
115-
exclude module: 'hamcrest-core'
116-
}
113+
implementation fileTree(dir: 'libs', include: ['*.jar'])
114+
implementation project(':scalarinputapi')
117115

118-
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
119-
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
116+
implementation deps.glide
117+
annotationProcessor deps.glideCompiler
120118

121-
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
119+
implementation deps.dagger
120+
annotationProcessor deps.daggerCompiler
122121

123-
implementation 'androidx.cardview:cardview:1.0.0'
124-
implementation 'androidx.exifinterface:exifinterface:1.2.0'
125-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
126-
implementation "androidx.constraintlayout:constraintlayout:2.0.1"
127-
implementation 'com.google.android.material:material:1.3.0-alpha02'
128-
implementation 'com.bignerdranch.android:expandablerecyclerview:2.1.1'
129-
implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
130-
implementation "com.github.bumptech.glide:glide:$glideVersion"
131-
implementation('com.google.api-client:google-api-client-android:1.25.0') {
132-
// Avoid error "Program type already present: com.google.common.annotations.Beta".
133-
exclude group: 'com.google.guava'
134-
// Avoid error "Program type already present: javax.annotation.CheckForNull"
135-
exclude group: 'com.google.code.findbugs'
136-
// Avoid error "Program type already present: com.google.j2objc.annotations.AutoreleasePool"
137-
exclude group: 'com.google.j2objc'
138-
}
139-
implementation 'com.google.ar:core:1.9.0'
140-
implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
141-
implementation "com.google.dagger:dagger:$daggerVersion"
142-
implementation("com.google.guava:guava:$guavaVersion") {
122+
implementation deps.cardview
123+
implementation deps.exifinterface
124+
implementation deps.recyclerview
125+
implementation deps.constraintlayout
126+
implementation deps.material
127+
implementation deps.expandablerecyclerview
128+
implementation deps.swiperefreshlayout
129+
130+
implementation deps.rxJava
131+
implementation deps.rxAndroid
132+
implementation deps.rxbinding
133+
implementation deps.rxPermissions
134+
135+
implementation deps.jodaTime
136+
implementation deps.jodaConvert
137+
138+
implementation deps.crypto
139+
implementation deps.jwtdecode
140+
implementation deps.androidsvg
141+
implementation deps.protobufLite
142+
// Depend on jsyn maven repo.
143+
implementation deps.jsyn
144+
145+
implementation deps.arcore
146+
implementation deps.sceneform
147+
148+
implementation(deps.guava) {
143149
// Avoid error "Program type already present: javax.annotation.CheckForNull"
144150
exclude group: 'com.google.code.findbugs'
145151
// Avoid error "Program type already present: org.checkerframework.checker.nullness.compatqual.NullableType"
@@ -149,37 +155,19 @@ dependencies {
149155
// Avoid error "Program type already present: org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement"
150156
exclude group: 'org.codehaus.mojo'
151157
}
152-
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
153-
// Depend on jsyn maven repo.
154-
implementation 'com.jsyn:jsyn:20170815'
155-
implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar'
156-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
157-
implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
158-
implementation 'joda-time:joda-time:2.9.9'
159-
implementation 'org.joda:joda-convert:1.8'
160158

161159
implementation 'com.google.android.gms:play-services-auth:19.0.0'
162-
implementation 'com.google.api-client:google-api-client-android:1.25.0'
163-
164-
implementation fileTree(dir: 'libs', include: ['*.jar'])
165-
166-
implementation project(':scalarinputapi')
167160

168-
implementation 'androidx.security:security-crypto:1.0.0-rc04'
169-
170-
implementation 'com.auth0.android:jwtdecode:2.0.0'
171-
172-
implementation 'com.caverock:androidsvg-aar:1.4'
173-
174-
implementation('com.google.api-client:google-api-client-android:1.25.0') {
161+
implementation(deps.googleApiClient) {
175162
// Avoid error "Program type already present: com.google.common.annotations.Beta".
176163
exclude group: 'com.google.guava'
177164
// Avoid error "Program type already present: javax.annotation.CheckForNull"
178165
exclude group: 'com.google.code.findbugs'
179166
// Avoid error "Program type already present: com.google.j2objc.annotations.AutoreleasePool"
180167
exclude group: 'com.google.j2objc'
181168
}
182-
implementation('com.google.apis:google-api-services-drive:v2-rev362-1.25.0') {
169+
170+
implementation(deps.driveApi) {
183171
// Avoid error "Program type already present: com.google.common.annotations.Beta".
184172
exclude group: 'com.google.guava'
185173
// Avoid error "Program type already present: javax.annotation.CheckForNull"
@@ -188,11 +176,14 @@ dependencies {
188176
exclude group: 'com.google.j2objc'
189177
}
190178

191-
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
179+
debugImplementation deps.leakCanary
180+
releaseImplementation deps.leakCanaryNoop
192181

193-
testImplementation "junit:junit:$junitVersion"
194-
195-
testImplementation("org.robolectric:robolectric:$robolectricVersion") {
182+
testImplementation deps.junit
183+
androidTestImplementation(deps.junit) {
184+
exclude module: 'hamcrest-core'
185+
}
186+
testImplementation(deps.robolectric) {
196187
exclude group: 'commons-logging', module: 'commons-logging'
197188
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
198189
}

‎OpenScienceJournal/whistlepunk_library/dependencyVersions.gradle‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,61 @@
11
ext {
2+
appCompatVersion = "1.2.0"
3+
rxJavaVersion = "2.1.3"
4+
25
daggerVersion = "2.29.1"
36
glideVersion = "4.11.0"
47
guavaVersion = "29.0-android"
58
jsr250Version = "1.0"
69
junitVersion = "4.12"
710
leakCanaryVersion = "1.5.4"
811
robolectricVersion = "3.7"
12+
13+
deps = [
14+
'core': 'androidx.core:core:1.5.0-alpha02',
15+
'appCompat': "androidx.appcompat:appcompat:$appCompatVersion",
16+
'swiperefreshlayout': "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
17+
18+
'glide': "com.github.bumptech.glide:glide:$glideVersion",
19+
'glideCompiler': "com.github.bumptech.glide:compiler:$glideVersion",
20+
21+
"leakCanary": "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion",
22+
"leakCanaryNoop": "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion",
23+
24+
"cardview": "androidx.cardview:cardview:1.0.0",
25+
"exifinterface": "androidx.exifinterface:exifinterface:1.2.0",
26+
"recyclerview": "androidx.recyclerview:recyclerview:1.1.0",
27+
"constraintlayout": "androidx.constraintlayout:constraintlayout:2.0.1",
28+
"material": "com.google.android.material:material:1.3.0-alpha02",
29+
"expandablerecyclerview": "com.bignerdranch.android:expandablerecyclerview:2.1.1",
30+
31+
'rxJava' : "io.reactivex.rxjava2:rxjava:$rxJavaVersion",
32+
'rxAndroid' : "io.reactivex.rxjava2:rxandroid:2.0.1",
33+
"rxbinding": "com.jakewharton.rxbinding2:rxbinding:2.0.0",
34+
"rxPermissions": "com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar",
35+
36+
"jodaTime": "joda-time:joda-time:2.9.9",
37+
"jodaConvert": "org.joda:joda-convert:1.8",
38+
39+
'daggerCompiler': "com.google.dagger:dagger-compiler:$daggerVersion",
40+
'dagger': "com.google.dagger:dagger:$daggerVersion",
41+
'protobufLite': 'com.google.protobuf:protobuf-lite:3.0.0',
42+
'guava': "com.google.guava:guava:$guavaVersion",
43+
44+
"arcore" : "com.google.ar:core:1.9.0",
45+
"sceneform" : "com.google.ar.sceneform.ux:sceneform-ux:1.9.0",
46+
47+
'playServicesAuth': 'com.google.android.gms:play-services-auth:17.0.0',
48+
'googleApiClient': 'com.google.api-client:google-api-client-android:1.25.0',
49+
'driveApi' : "com.google.apis:google-api-services-drive:v2-rev362-1.25.0",
50+
51+
"crypto": "androidx.security:security-crypto:1.0.0-rc04",
52+
53+
"jsyn": "com.jsyn:jsyn:20170815",
54+
55+
"jwtdecode": "com.auth0.android:jwtdecode:2.0.0",
56+
"androidsvg": "com.caverock:androidsvg-aar:1.4",
57+
58+
'junit': "junit:junit:$junitVersion",
59+
"robolectric": "org.robolectric:robolectric:$robolectricVersion"
60+
]
961
}

0 commit comments

Comments
 (0)