Skip to content

Trying to fix issue #72 - Targeting Android 28, with Android Studio 3.2.1 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 29, 2018
Merged

Trying to fix issue #72 - Targeting Android 28, with Android Studio 3.2.1 #73

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04022b9
Now targeting Android 28, with Android Studio 3.2.1
yos1p Oct 12, 2018
60c09b7
Fixing "net.java:quick-check" annotation processor.
yos1p Oct 19, 2018
a53de6e
Add "net.java.quickcheck:quickcheck-src-generator:0.6" annotation pro…
yos1p Oct 19, 2018
8a47cc0
test-apps now use Java 8 & Android 28
yos1p Oct 19, 2018
ab2f999
- Use JAVA_VERSION
yos1p Oct 20, 2018
bdc2981
- Keep using Retrolambda instead of Android builtin features
yos1p Oct 27, 2018
7817a6d
Merge pull request from firebase/master
yos1p Oct 27, 2018
4113607
Remove duplicated resource files in fiam-display
yos1p Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation "com.jaredsburrows:gradle-license-plugin:0.8.1"
implementation 'digital.wup:android-maven-publish:3.6.2'

implementation 'com.android.tools.build:gradle:3.0.1'
implementation 'com.android.tools.build:gradle:3.2.1'
testImplementation 'junit:junit:4.12'
testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
exclude group: 'org.codehaus.groovy'
Expand Down
2 changes: 1 addition & 1 deletion ...c/src/main/groovy/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class LicenseResolverPlugin implements Plugin<Project> {

// must run before preBuild, otherwise it produces an empty license report.
project.tasks.getByName('preBuild').mustRunAfter licensesTask
project.tasks.getByName("bundle${variantName}") {
project.tasks.getByName("bundle${variantName}Aar") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ashwinraghav can you sanity check this?
@iamyaoxi can you explain this change? Is this something to do with the newer gradle plugin?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I think it's related to the newer Gradle plugin. I tried to use bundle${variantName} task, it always failing. And I read it's already replaced with bundleAar

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opened (but already closed) issue #71
The error was: Task with name 'bundleRelease' not found in project ':firebase-common'

dependsOn licensesTask
from licensesTask.outputDir
}
Expand Down
22 changes: 10 additions & 12 deletions firebase-common/firebase-common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apply plugin: 'com.android.library'

def androidVersion = 26
def androidVersion = 28

android {
adbOptions {
Expand All @@ -23,16 +23,13 @@ android {

compileSdkVersion androidVersion
defaultConfig {
minSdkVersion 14
targetSdkVersion androidVersion

multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
sourceSets {
main {
java {
}
}
androidTest {
java {
srcDir 'src/testUtil'
Expand All @@ -58,18 +55,19 @@ android {
dependencies {
implementation "com.google.android.gms:play-services-basement:$playServicesVersion"
implementation "com.google.android.gms:play-services-tasks:$playServicesVersion"
compileOnly 'com.google.code.findbugs:jsr305:1.3.9'

compileOnly 'com.google.code.findbugs:jsr305:3.0.2'

testImplementation 'com.android.support.test:runner:1.0.2'
testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
testImplementation 'junit:junit:4.11'
testImplementation 'com.google.truth:truth:0.36'
testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.42'
testImplementation 'org.mockito:mockito-core:2.21.0'

androidTestImplementation 'junit:junit:4.11'
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.google.truth:truth:0.36'
androidTestImplementation 'org.mockito:mockito-core:1.10.19'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'org.mockito:mockito-core:2.21.0'
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.16.0'
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
androidTestImplementation ('com.google.firebase:firebase-auth:16.0.2') {
Expand Down
1 change: 0 additions & 1 deletion firebase-common/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.firebase">
<uses-sdk android:minSdkVersion="14"/>
<application>

<provider
Expand Down
22 changes: 19 additions & 3 deletions firebase-database-collection/firebase-database-collection.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,29 @@

apply plugin: 'com.android.library'

def androidVersion = 26
def androidVersion = 28

android {
compileSdkVersion androidVersion
defaultConfig {
minSdkVersion 14
}
buildTypes {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines look a little suspicious:

  • Do we need the empty sourceSets?
  • Shouldn't the compileOptions be inherited?
  • I don't think we want useProguard true anymore, we're not proguarding these SDKs going forward. Or is that only needed to pass forward the consumerProguardFiles?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • compileOptions is not inherited. It always failed when I didn't set it to Java 8.
  • I only follow pattern of other projects for the use of useProguard true. So should we remove it, as well in other projects?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ashwinraghav ?

release {
minifyEnabled false
}
debug {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
testCompile 'junit:junit:4.11'
testCompile 'net.java:quickcheck:0.6'
testImplementation 'junit:junit:4.12'
testImplementation 'net.java:quickcheck:0.6'
testAnnotationProcessor 'net.java:quickcheck-src-generator:0.6'
testAnnotationProcessor 'net.java.quickcheck:quickcheck-src-generator:0.6'
}
3 changes: 1 addition & 2 deletions firebase-database-collection/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
<manifest
package="com.google.firebase.database.collection">
<uses-sdk android:minSdkVersion="9" />
</manifest>
38 changes: 19 additions & 19 deletions firebase-database/firebase-database.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apply plugin: 'com.android.library'

def androidVersion = 26
def androidVersion = 28


tasks.withType(org.gradle.api.tasks.testing.Test) {
Expand All @@ -35,33 +35,30 @@ android {
compileSdkVersion androidVersion
defaultConfig {
targetSdkVersion androidVersion
minSdkVersion 14
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
useProguard true
consumerProguardFiles 'proguard.txt'
}
debug {
}
}
sourceSets {
sourceSets {
androidTest {
java {
srcDir 'src/testUtil/java'
}
androidTest {
java {
srcDir 'src/testUtil/java'
}
test {
java {
srcDir 'src/testUtil/java'
}
resources {
srcDirs "src/test/resources"
}
}
test {
java {
srcDir 'src/testUtil/java'
}
resources {
srcDirs "src/test/resources"
}
}
}
Expand All @@ -86,20 +83,23 @@ dependencies {
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.google.truth:truth:0.39'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'net.java.quickcheck:quickcheck:0.6'
androidTestImplementation 'net.java:quickcheck:0.6'
androidTestAnnotationProcessor 'net.java:quickcheck-src-generator:0.6'
androidTestAnnotationProcessor 'net.java.quickcheck:quickcheck-src-generator:0.6'


testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.18.3'
testImplementation 'org.mockito:mockito-core:2.21.0'
testImplementation 'org.robolectric:robolectric:3.8'
testImplementation 'com.firebase:firebase-token-generator:2.0.0'
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
testImplementation 'net.java.quickcheck:quickcheck:0.6'
testImplementation 'com.google.truth:truth:0.39'
testImplementation 'com.google.truth:truth:0.42'
testImplementation 'com.android.support.test:rules:1.0.2'

}
Expand Down
3 changes: 1 addition & 2 deletions firebase-database/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.firebase.database.android">
<uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="23"/>

<uses-permission android:name="android.permission.INTERNET"/>
<application android:label="FirebaseDatabaseTests" android:largeHeap="true">
<uses-library android:name="android.test.runner"/>
Expand Down
1 change: 0 additions & 1 deletion firebase-database/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

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

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
30 changes: 17 additions & 13 deletions firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
apply plugin: 'com.android.library'
apply plugin: 'com.google.protobuf'

def androidVersion = 26
def androidVersion = 28

protobuf {
// Configure the protoc executable
Expand Down Expand Up @@ -56,6 +56,7 @@ android {
compileSdkVersion androidVersion
defaultConfig {
targetSdkVersion androidVersion
minSdkVersion 14
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -90,6 +91,9 @@ dependencies {
implementation project(':protolite-well-known-types')
implementation project(':firebase-database-collection')

//To provide @Generated annotations
compileOnly 'javax.annotation:jsr250-api:1.0'

implementation 'io.grpc:grpc-stub:1.12.0'
implementation 'io.grpc:grpc-protobuf-lite:1.12.0'
implementation 'io.grpc:grpc-okhttp:1.12.0'
Expand All @@ -104,19 +108,19 @@ dependencies {
exclude group: "com.google.firebase", module: "firebase-common"
}

testCompile 'junit:junit:4.11'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.robolectric:robolectric:4.0-alpha-3'
testCompile 'com.google.truth:truth:0.36'
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
testCompile 'com.google.guava:guava-testlib:12.0-rc2'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.21.0'
testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
testImplementation 'com.google.truth:truth:0.42'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'

androidTestCompile 'junit:junit:4.11'
androidTestCompile 'com.google.truth:truth:0.36'
androidTestCompile 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
androidTestCompile "com.android.support:support-annotations:$supportAnnotationsVersion"
androidTestCompile 'com.android.support.test:runner:1.0.2'
androidTestCompile 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}

// ==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion firebase-firestore/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<lint>
<!--A linter bug prevents us from being able to analyze this file.-->
<!--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 -->
<issue id="all">
<issue id="LintError">
<ignore path="src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java"/>
</issue>

Expand Down
2 changes: 0 additions & 2 deletions firebase-firestore/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.firebase.firestore">
<uses-sdk android:minSdkVersion="14" />

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<application>
Expand Down
21 changes: 9 additions & 12 deletions firebase-functions/firebase-functions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apply plugin: 'com.android.library'

def androidVersion = 26
def androidVersion = 28

android {
adbOptions {
Expand All @@ -24,15 +24,12 @@ android {
compileSdkVersion androidVersion
defaultConfig {
targetSdkVersion androidVersion
minSdkVersion 14

multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
sourceSets {
main {
java {
}
}
androidTest {
java {
srcDir 'src/testUtil'
Expand Down Expand Up @@ -62,13 +59,13 @@ dependencies {

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

androidTestCompile 'junit:junit:4.11'
androidTestCompile 'com.google.truth:truth:0.36'
androidTestCompile 'com.android.support.test:runner:1.0.2'
androidTestCompile 'org.mockito:mockito-core:1.10.19'
androidTestCompile 'com.google.truth:truth:0.36'
androidTestCompile 'com.linkedin.dexmaker:dexmaker:2.16.0'
androidTestCompile 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'org.mockito:mockito-core:2.21.0'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.16.0'
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'


}
Expand Down
2 changes: 0 additions & 2 deletions firebase-functions/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.firebase.functions">
<uses-sdk android:minSdkVersion="15"
android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.INTERNET"/>
<application>
<uses-library android:name="android.test.runner" />
Expand Down
1 change: 0 additions & 1 deletion firebase-functions/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.firebase.functions">
<uses-sdk android:minSdkVersion="14" />
<uses-permission android:name="android.permission.INTERNET" />
<application>
<service android:name="com.google.firebase.components.ComponentDiscoveryService">
Expand Down
7 changes: 4 additions & 3 deletions firebase-storage/firebase-storage.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

apply plugin: 'com.android.library'

def androidVersion = 26
def androidVersion = 28


tasks.withType(org.gradle.api.tasks.testing.Test) {
Expand All @@ -35,6 +35,7 @@ android {
compileSdkVersion androidVersion
defaultConfig {
targetSdkVersion androidVersion
minSdkVersion 14
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -82,10 +83,10 @@ dependencies {
androidTestImplementation "com.android.support:support-annotations:$supportAnnotationsVersion"
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.google.truth:truth:0.39'
androidTestImplementation 'com.google.truth:truth:0.42'
androidTestImplementation 'junit:junit:4.12'

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.18.3'
testImplementation 'org.mockito:mockito-core:2.21.0'
testImplementation 'org.robolectric:robolectric:4.0-alpha-3-SNAPSHOT'
}
2 changes: 0 additions & 2 deletions firebase-storage/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.firebase.storage.integration">
<uses-sdk android:minSdkVersion="15"
android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down
Loading