Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit aadcc02

Browse files
ajaltajalt
committed
Update dependencies and min api to 14.
Using `implementation` for the spass dependencies should hopefully fix all the build warnings that it caused.
1 parent 1e7ba80 commit aadcc02

File tree

9 files changed

+59
-76
lines changed

9 files changed

+59
-76
lines changed

‎build.gradle‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
buildscript {
22
repositories {
3+
google()
34
mavenCentral()
45
jcenter()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.1'
8-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
8+
classpath 'com.android.tools.build:gradle:3.0.0'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
910
}
1011
}
1112

12-
subprojects {
13+
subprojects {
1314
version = VERSION_NAME
1415
group = GROUP
1516

1617
repositories {
18+
google()
1719
mavenCentral()
1820
jcenter()
1921
}
@@ -24,25 +26,23 @@ task clean(type: Delete) {
2426
}
2527

2628
ext {
27-
minSdkVersion = 10
28-
targetSdkVersion = 25
29-
compileSdkVersion = 25
30-
buildToolsVersion = '25.0.3'
29+
minSdkVersion = 14
30+
compileSdkVersion = 26
31+
buildToolsVersion = '26.0.2'
3132

3233
// dependencies
33-
supportV7 = 'com.android.support:appcompat-v7:25.3.1'
34-
rxjava1 = 'io.reactivex:rxjava:1.2.10'
35-
rxjava2 = 'io.reactivex.rxjava2:rxjava:2.0.9'
34+
supportV7 = 'com.android.support:appcompat-v7:26.1.0'
35+
rxjava1 = 'io.reactivex:rxjava:1.3.3'
36+
rxjava2 = 'io.reactivex.rxjava2:rxjava:2.1.6'
3637

3738
// sample dependencies
38-
supportDesign = 'com.android.support:design:25.3.1'
39-
butterknife = 'com.jakewharton:butterknife:7.0.1'
40-
gradleRetrolambda = 'me.tatarka:gradle-retrolambda:3.6.1'
41-
retrolambda = 'net.orfjackal.retrolambda:retrolambda:2.5.1'
39+
supportDesign = 'com.android.support:design:26.1.0'
40+
butterknife = 'com.jakewharton:butterknife:8.8.1'
41+
butterknifeProcessor = 'com.jakewharton:butterknife-compiler:8.8.1'
4242

4343
// test dependencies
4444
junit = 'junit:junit:4.12'
45-
assertj = 'org.assertj:assertj-core:2.6.0'
46-
robolectric = 'org.robolectric:robolectric:3.3.2'
47-
mockito = 'org.mockito:mockito-core:2.8.8'
45+
assertj = 'org.assertj:assertj-core:3.8.0'
46+
robolectric = 'org.robolectric:robolectric:3.5.1'
47+
mockito = 'org.mockito:mockito-core:2.11.0'
4848
}

‎core/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77

88
defaultConfig {
99
minSdkVersion rootProject.ext.minSdkVersion
10-
targetSdkVersion rootProject.ext.targetSdkVersion
1110
versionCode Integer.parseInt(project.VERSION_CODE)
1211
versionName project.VERSION_NAME
1312
}
@@ -24,7 +23,7 @@ android {
2423
}
2524

2625
dependencies {
27-
compile rootProject.ext.supportV7
26+
api rootProject.ext.supportV7
2827
}
2928

3029
apply from: rootProject.file('javadoc.gradle')

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Apr 23 09:25:31 PDT 2017
2-
distributionBase=GRADLE_USER_HOME
3-
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
1+
#Sat Nov 04 11:08:07 PDT 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

‎reprint_spass/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77

88
defaultConfig {
99
minSdkVersion rootProject.ext.minSdkVersion
10-
targetSdkVersion rootProject.ext.targetSdkVersion
1110
versionCode Integer.parseInt(project.VERSION_CODE)
1211
versionName project.VERSION_NAME
1312
}
@@ -20,7 +19,7 @@ android {
2019
}
2120

2221
dependencies {
23-
compile project(':core')
24-
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile rootProject.ext.supportV7
22+
api project(':core')
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
24+
api rootProject.ext.supportV7
2625
}

‎rxjava/build.gradle‎

100644100755
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ android {
77

88
defaultConfig {
99
minSdkVersion rootProject.ext.minSdkVersion
10-
targetSdkVersion rootProject.ext.targetSdkVersion
1110
versionCode Integer.parseInt(project.VERSION_CODE)
1211
versionName project.VERSION_NAME
1312
}
1413
}
1514

1615
dependencies {
17-
compile project(':core')
18-
compile rootProject.ext.supportV7
19-
compile rootProject.ext.rxjava1
16+
api project(':core')
17+
api rootProject.ext.supportV7
18+
api rootProject.ext.rxjava1
2019
}
2120

2221
apply from: rootProject.file('javadoc.gradle')

‎rxjava2/build.gradle‎

100644100755
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ android {
77

88
defaultConfig {
99
minSdkVersion rootProject.ext.minSdkVersion
10-
targetSdkVersion rootProject.ext.targetSdkVersion
1110
versionCode Integer.parseInt(project.VERSION_CODE)
1211
versionName project.VERSION_NAME
1312
}
1413
}
1514

1615
dependencies {
17-
compile project(':core')
18-
compile rootProject.ext.supportV7
19-
compile rootProject.ext.rxjava2
16+
api project(':core')
17+
api rootProject.ext.supportV7
18+
api rootProject.ext.rxjava2
2019
}
2120

2221
apply from: rootProject.file('javadoc.gradle')

‎sample/build.gradle‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'me.tatarka.retrolambda'
3-
4-
buildscript {
5-
repositories {
6-
mavenCentral()
7-
}
8-
9-
dependencies {
10-
classpath rootProject.ext.gradleRetrolambda
11-
}
12-
}
132

143
android {
154
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -18,7 +7,7 @@ android {
187
defaultConfig {
198
applicationId project.GROUP
209
minSdkVersion rootProject.ext.minSdkVersion
21-
targetSdkVersion rootProject.ext.targetSdkVersion
10+
targetSdkVersion rootProject.ext.compileSdkVersion
2211
versionCode Integer.parseInt(project.VERSION_CODE)
2312
versionName project.VERSION_NAME
2413
}
@@ -40,14 +29,13 @@ android {
4029
}
4130

4231
dependencies {
43-
compile project(':core')
44-
compile project(':reprint_spass')
45-
compile project(':rxjava')
46-
compile project(':rxjava2')
47-
48-
compile rootProject.ext.supportV7
49-
compile rootProject.ext.supportDesign
50-
compile rootProject.ext.butterknife
51-
52-
retrolambdaConfig rootProject.ext.retrolambda
32+
implementation project(':core')
33+
implementation project(':reprint_spass')
34+
implementation project(':rxjava')
35+
implementation project(':rxjava2')
36+
37+
implementation rootProject.ext.supportV7
38+
implementation rootProject.ext.supportDesign
39+
implementation rootProject.ext.butterknife
40+
annotationProcessor rootProject.ext.butterknifeProcessor
5341
}

‎sample/src/main/java/com/github/ajalt/reprint/MainActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,34 @@
1313
import com.github.ajalt.reprint.core.AuthenticationListener;
1414
import com.github.ajalt.reprint.core.Reprint;
1515

16-
import butterknife.Bind;
16+
import butterknife.BindView;
1717
import butterknife.ButterKnife;
1818
import butterknife.OnClick;
1919

2020
@SuppressLint("SetTextI18n")
2121
public class MainActivity extends AppCompatActivity {
22-
@Bind(R.id.fab)
22+
@BindView(R.id.fab)
2323
FloatingActionButton fab;
2424

25-
@Bind(R.id.result)
25+
@BindView(R.id.result)
2626
TextView result;
2727

28-
@Bind(R.id.hardware_present)
28+
@BindView(R.id.hardware_present)
2929
TextView hardwarePresent;
3030

31-
@Bind(R.id.fingerprints_registered)
31+
@BindView(R.id.fingerprints_registered)
3232
TextView fingerprintsRegistered;
3333

34-
@Bind(R.id.radio_callbacks)
34+
@BindView(R.id.radio_callbacks)
3535
CompoundButton radioCallbacks;
3636

37-
@Bind(R.id.radio_rxjava1)
37+
@BindView(R.id.radio_rxjava1)
3838
CompoundButton radioRxJava1;
3939

40-
@Bind(R.id.radio_rxjava2)
40+
@BindView(R.id.radio_rxjava2)
4141
CompoundButton radioRxJava2;
4242

43-
@Bind(R.id.toolbar)
43+
@BindView(R.id.toolbar)
4444
Toolbar toolbar;
4545

4646
private boolean running;

‎tests/build.gradle‎

100644100755
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ android {
66

77
defaultConfig {
88
minSdkVersion rootProject.ext.minSdkVersion
9-
targetSdkVersion rootProject.ext.targetSdkVersion
109
versionCode Integer.parseInt(project.VERSION_CODE)
1110
versionName project.VERSION_NAME
1211
}
@@ -19,12 +18,12 @@ android {
1918
}
2019

2120
dependencies {
22-
compile project(':core')
23-
compile project(':rxjava')
24-
compile project(':rxjava2')
21+
implementation project(':core')
22+
implementation project(':rxjava')
23+
implementation project(':rxjava2')
2524

26-
testCompile rootProject.ext.junit
27-
testCompile rootProject.ext.assertj
28-
testCompile rootProject.ext.robolectric
29-
testCompile rootProject.ext.mockito
25+
testImplementation rootProject.ext.junit
26+
testImplementation rootProject.ext.assertj
27+
testImplementation rootProject.ext.robolectric
28+
testImplementation rootProject.ext.mockito
3029
}

0 commit comments

Comments
 (0)