Skip to content

Commit 8ccb305

Browse files
yos1pashwinraghav
yos1p
authored and
ashwinraghav
committed
Trying to fix issue #72 - Targeting Android 28, with Android Studio 3.2.1
1 parent a024da6 commit 8ccb305

File tree

35 files changed

+160
-161
lines changed

35 files changed

+160
-161
lines changed

‎buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
implementation "com.jaredsburrows:gradle-license-plugin:0.8.1"
3838
implementation 'digital.wup:android-maven-publish:3.6.2'
3939

40-
implementation 'com.android.tools.build:gradle:3.0.1'
40+
implementation 'com.android.tools.build:gradle:3.2.1'
4141
testImplementation 'junit:junit:4.12'
4242
testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
4343
exclude group: 'org.codehaus.groovy'

‎buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class LicenseResolverPlugin implements Plugin<Project> {
9898

9999
// must run before preBuild, otherwise it produces an empty license report.
100100
project.tasks.getByName('preBuild').mustRunAfter licensesTask
101-
project.tasks.getByName("bundle${variantName}") {
101+
project.tasks.getByName("bundle${variantName}Aar") {
102102
dependsOn licensesTask
103103
from licensesTask.outputDir
104104
}

‎firebase-common/firebase-common.gradle

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apply plugin: 'com.android.library'
1616

17-
def androidVersion = 26
17+
def androidVersion = 28
1818

1919
android {
2020
adbOptions {
@@ -23,16 +23,13 @@ android {
2323

2424
compileSdkVersion androidVersion
2525
defaultConfig {
26+
minSdkVersion 14
2627
targetSdkVersion androidVersion
2728

2829
multiDexEnabled true
2930
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3031
}
3132
sourceSets {
32-
main {
33-
java {
34-
}
35-
}
3633
androidTest {
3734
java {
3835
srcDir 'src/testUtil'
@@ -58,18 +55,19 @@ android {
5855
dependencies {
5956
implementation "com.google.android.gms:play-services-basement:$playServicesVersion"
6057
implementation "com.google.android.gms:play-services-tasks:$playServicesVersion"
61-
compileOnly 'com.google.code.findbugs:jsr305:1.3.9'
58+
59+
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
6260

6361
testImplementation 'com.android.support.test:runner:1.0.2'
6462
testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
65-
testImplementation 'junit:junit:4.11'
66-
testImplementation 'com.google.truth:truth:0.36'
67-
testImplementation 'org.mockito:mockito-core:1.10.19'
63+
testImplementation 'junit:junit:4.12'
64+
testImplementation 'com.google.truth:truth:0.42'
65+
testImplementation 'org.mockito:mockito-core:2.21.0'
6866

69-
androidTestImplementation 'junit:junit:4.11'
67+
androidTestImplementation 'junit:junit:4.12'
7068
androidTestImplementation 'com.android.support.test:runner:1.0.2'
71-
androidTestImplementation 'com.google.truth:truth:0.36'
72-
androidTestImplementation 'org.mockito:mockito-core:1.10.19'
69+
androidTestImplementation 'com.google.truth:truth:0.42'
70+
androidTestImplementation 'org.mockito:mockito-core:2.21.0'
7371
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.16.0'
7472
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
7573
androidTestImplementation ('com.google.firebase:firebase-auth:16.0.2') {

‎firebase-common/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.firebase">
4-
<uses-sdk android:minSdkVersion="14"/>
54
<application>
65

76
<provider

‎firebase-database-collection/firebase-database-collection.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@
1414

1515
apply plugin: 'com.android.library'
1616

17-
def androidVersion = 26
17+
def androidVersion = 28
1818

1919
android {
2020
compileSdkVersion androidVersion
21+
defaultConfig {
22+
minSdkVersion 9
23+
}
2124
}
2225

2326
dependencies {
24-
testCompile 'junit:junit:4.11'
25-
testCompile 'net.java:quickcheck:0.6'
27+
testImplementation 'junit:junit:4.12'
28+
testImplementation 'net.java:quickcheck:0.6'
29+
testAnnotationProcessor 'net.java:quickcheck-src-generator:0.6'
30+
testAnnotationProcessor 'net.java.quickcheck:quickcheck-src-generator:0.6'
2631
}

‎firebase-database-collection/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
<manifest
33
package="com.google.firebase.database.collection">
4-
<uses-sdk android:minSdkVersion="9" />
54
</manifest>

‎firebase-database/firebase-database.gradle

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apply plugin: 'com.android.library'
1616

17-
def androidVersion = 26
17+
def androidVersion = 28
1818

1919

2020
tasks.withType(org.gradle.api.tasks.testing.Test) {
@@ -35,33 +35,30 @@ android {
3535
compileSdkVersion androidVersion
3636
defaultConfig {
3737
targetSdkVersion androidVersion
38+
minSdkVersion 14
3839
multiDexEnabled true
3940
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
4041
}
4142

4243
buildTypes {
4344
release {
4445
minifyEnabled false
45-
useProguard true
46-
consumerProguardFiles 'proguard.txt'
4746
}
4847
debug {
4948
}
5049
}
5150
sourceSets {
52-
sourceSets {
53-
androidTest {
54-
java {
55-
srcDir 'src/testUtil/java'
56-
}
51+
androidTest {
52+
java {
53+
srcDir 'src/testUtil/java'
5754
}
58-
test {
59-
java {
60-
srcDir 'src/testUtil/java'
61-
}
62-
resources {
63-
srcDirs "src/test/resources"
64-
}
55+
}
56+
test {
57+
java {
58+
srcDir 'src/testUtil/java'
59+
}
60+
resources {
61+
srcDirs "src/test/resources"
6562
}
6663
}
6764
}
@@ -86,20 +83,23 @@ dependencies {
8683
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
8784
androidTestImplementation 'com.android.support.test:rules:1.0.2'
8885
androidTestImplementation 'com.android.support.test:runner:1.0.2'
89-
androidTestImplementation 'com.google.truth:truth:0.39'
86+
androidTestImplementation 'com.google.truth:truth:0.42'
9087
androidTestImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
9188
androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
9289
androidTestImplementation 'junit:junit:4.12'
93-
androidTestImplementation 'net.java.quickcheck:quickcheck:0.6'
90+
androidTestImplementation 'net.java:quickcheck:0.6'
91+
androidTestAnnotationProcessor 'net.java:quickcheck-src-generator:0.6'
92+
androidTestAnnotationProcessor 'net.java.quickcheck:quickcheck-src-generator:0.6'
93+
9494

9595
testImplementation 'junit:junit:4.12'
96-
testImplementation 'org.mockito:mockito-core:2.18.3'
96+
testImplementation 'org.mockito:mockito-core:2.21.0'
9797
testImplementation 'org.robolectric:robolectric:3.8'
9898
testImplementation 'com.firebase:firebase-token-generator:2.0.0'
9999
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
100100
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
101101
testImplementation 'net.java.quickcheck:quickcheck:0.6'
102-
testImplementation 'com.google.truth:truth:0.39'
102+
testImplementation 'com.google.truth:truth:0.42'
103103
testImplementation 'com.android.support.test:rules:1.0.2'
104104

105105
}

‎firebase-database/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1717
xmlns:tools="http://schemas.android.com/tools"
1818
package="com.google.firebase.database.android">
19-
<uses-sdk android:minSdkVersion="14"
20-
android:targetSdkVersion="23"/>
19+
2120
<uses-permission android:name="android.permission.INTERNET"/>
2221
<application android:label="FirebaseDatabaseTests" android:largeHeap="true">
2322
<uses-library android:name="android.test.runner"/>

‎firebase-database/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1717
package="com.google.firebase.database">
18-
<uses-sdk android:minSdkVersion="14"/>
1918

2019
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2120
<uses-permission android:name="android.permission.INTERNET" />

‎firebase-firestore/firebase-firestore.gradle

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
apply plugin: 'com.android.library'
1616
apply plugin: 'com.google.protobuf'
1717

18-
def androidVersion = 26
18+
def androidVersion = 28
1919

2020
protobuf {
2121
// Configure the protoc executable
@@ -56,6 +56,7 @@ android {
5656
compileSdkVersion androidVersion
5757
defaultConfig {
5858
targetSdkVersion androidVersion
59+
minSdkVersion 14
5960
multiDexEnabled true
6061
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
6162
}
@@ -90,6 +91,9 @@ dependencies {
9091
implementation project(':protolite-well-known-types')
9192
implementation project(':firebase-database-collection')
9293

94+
//To provide @Generated annotations
95+
compileOnly 'javax.annotation:jsr250-api:1.0'
96+
9397
implementation 'io.grpc:grpc-stub:1.12.0'
9498
implementation 'io.grpc:grpc-protobuf-lite:1.12.0'
9599
implementation 'io.grpc:grpc-okhttp:1.12.0'
@@ -104,19 +108,19 @@ dependencies {
104108
exclude group: "com.google.firebase", module: "firebase-common"
105109
}
106110

107-
testCompile 'junit:junit:4.11'
108-
testCompile 'org.mockito:mockito-core:1.10.19'
109-
testCompile 'org.robolectric:robolectric:4.0-alpha-3'
110-
testCompile 'com.google.truth:truth:0.36'
111-
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
112-
testCompile 'com.google.guava:guava-testlib:12.0-rc2'
111+
testImplementation 'junit:junit:4.12'
112+
testImplementation 'org.mockito:mockito-core:2.21.0'
113+
testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
114+
testImplementation 'com.google.truth:truth:0.42'
115+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
116+
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
113117

114-
androidTestCompile 'junit:junit:4.11'
115-
androidTestCompile 'com.google.truth:truth:0.36'
116-
androidTestCompile 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
117-
androidTestCompile "com.android.support:support-annotations:$supportAnnotationsVersion"
118-
androidTestCompile 'com.android.support.test:runner:1.0.2'
119-
androidTestCompile 'com.android.support.test:rules:1.0.2'
118+
androidTestImplementation 'junit:junit:4.12'
119+
androidTestImplementation 'com.google.truth:truth:0.42'
120+
androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
121+
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
122+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
123+
androidTestImplementation 'com.android.support.test:rules:1.0.2'
120124
}
121125

122126
// ==========================================================================

‎firebase-firestore/lint.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<lint>
33
<!--A linter bug prevents us from being able to analyze this file.-->
44
<!--See: https://storage.googleapis.com/android-ci/pr-logs/pull/firebase_firebase-android-sdk/63/check/1049425133258674177/artifacts/firebase-firestore_build_reports/lint-results.html -->
5-
<issue id="all">
5+
<issue id="LintError">
66
<ignore path="src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java"/>
77
</issue>
88

‎firebase-firestore/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.google.firebase.firestore">
5-
<uses-sdk android:minSdkVersion="14" />
6-
75
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
86
<uses-permission android:name="android.permission.INTERNET" />
97
<application>

‎firebase-functions/firebase-functions.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apply plugin: 'com.android.library'
1616

17-
def androidVersion = 26
17+
def androidVersion = 28
1818

1919
android {
2020
adbOptions {
@@ -24,15 +24,12 @@ android {
2424
compileSdkVersion androidVersion
2525
defaultConfig {
2626
targetSdkVersion androidVersion
27+
minSdkVersion 14
2728

2829
multiDexEnabled true
2930
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3031
}
3132
sourceSets {
32-
main {
33-
java {
34-
}
35-
}
3633
androidTest {
3734
java {
3835
srcDir 'src/testUtil'
@@ -62,13 +59,13 @@ dependencies {
6259

6360
annotationProcessor 'com.google.auto.value:auto-value:1.6'
6461

65-
androidTestCompile 'junit:junit:4.11'
66-
androidTestCompile 'com.google.truth:truth:0.36'
67-
androidTestCompile 'com.android.support.test:runner:1.0.2'
68-
androidTestCompile 'org.mockito:mockito-core:1.10.19'
69-
androidTestCompile 'com.google.truth:truth:0.36'
70-
androidTestCompile 'com.linkedin.dexmaker:dexmaker:2.16.0'
71-
androidTestCompile 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
62+
androidTestImplementation 'junit:junit:4.12'
63+
androidTestImplementation 'com.google.truth:truth:0.42'
64+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
65+
androidTestImplementation 'org.mockito:mockito-core:2.21.0'
66+
androidTestImplementation 'com.google.truth:truth:0.42'
67+
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.16.0'
68+
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
7269

7370

7471
}

‎firebase-functions/src/androidTest/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.google.firebase.functions">
3-
<uses-sdk android:minSdkVersion="15"
4-
android:targetSdkVersion="23" />
53
<uses-permission android:name="android.permission.INTERNET"/>
64
<application>
75
<uses-library android:name="android.test.runner" />

‎firebase-functions/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.google.firebase.functions">
5-
<uses-sdk android:minSdkVersion="14" />
65
<uses-permission android:name="android.permission.INTERNET" />
76
<application>
87
<service android:name="com.google.firebase.components.ComponentDiscoveryService">

‎firebase-inappmessaging-display/src/main/res/drawable/btn_clear.png

-369 Bytes
Binary file not shown.

‎firebase-inappmessaging-display/src/main/res/drawable/image_placeholder.png

-522 Bytes
Binary file not shown.

‎firebase-storage/firebase-storage.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apply plugin: 'com.android.library'
1616

17-
def androidVersion = 26
17+
def androidVersion = 28
1818

1919

2020
tasks.withType(org.gradle.api.tasks.testing.Test) {
@@ -35,6 +35,7 @@ android {
3535
compileSdkVersion androidVersion
3636
defaultConfig {
3737
targetSdkVersion androidVersion
38+
minSdkVersion 14
3839
multiDexEnabled true
3940
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
4041
}
@@ -82,10 +83,10 @@ dependencies {
8283
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
8384
androidTestImplementation 'com.android.support.test:rules:1.0.2'
8485
androidTestImplementation 'com.android.support.test:runner:1.0.2'
85-
androidTestImplementation 'com.google.truth:truth:0.39'
86+
androidTestImplementation 'com.google.truth:truth:0.42'
8687
androidTestImplementation 'junit:junit:4.12'
8788

8889
testImplementation 'junit:junit:4.12'
89-
testImplementation 'org.mockito:mockito-core:2.18.3'
90+
testImplementation 'org.mockito:mockito-core:2.21.0'
9091
testImplementation 'org.robolectric:robolectric:4.0-alpha-3-SNAPSHOT'
9192
}

‎firebase-storage/src/androidTest/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1616
package="com.google.firebase.storage.integration">
17-
<uses-sdk android:minSdkVersion="15"
18-
android:targetSdkVersion="23" />
1917
<uses-permission android:name="android.permission.INTERNET"/>
2018
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
2119
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

‎firebase-storage/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1717
xmlns:tools="http://schemas.android.com/tools"
1818
package="com.google.firebase.storage">
19-
<uses-sdk android:minSdkVersion="14"/>
2019

2120
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2221
<uses-permission android:name="android.permission.INTERNET" />

0 commit comments

Comments
 (0)