Skip to content

Api 28 update #683

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 2 commits into from
Sep 25, 2018
Merged

Api 28 update #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f35be6e
Auto-update dependencies.
dpebot Sep 24, 2018
3650994
Update project for API 28
samtstern Sep 25, 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
14 changes: 7 additions & 7 deletions admob/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
check.dependsOn 'assembleDebugAndroidTest'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
applicationId "com.google.samples.quickstart.admobexample"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"

Expand All @@ -29,15 +29,15 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
}

dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooser")
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:customtabs:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:customtabs:28.0.0'

// [START gradle_play_config]
implementation 'com.google.firebase:firebase-ads:15.0.1'
Expand All @@ -47,7 +47,7 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion ...p/src/androidTest/java/com/google/samples/quickstart/admobexample/InterstitialAdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.support.test.espresso.ViewInteraction;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import android.support.test.filters.LargeTest;

import com.google.samples.quickstart.admobexample.java.MainActivity;

Expand Down
2 changes: 1 addition & 1 deletion admob/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:4.1.0'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion admob/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
12 changes: 6 additions & 6 deletions analytics/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
check.dependsOn 'assembleDebugAndroidTest'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
applicationId "com.google.firebase.quickstart.analytics"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand All @@ -24,16 +24,16 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
}

dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooser")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"

implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'

implementation 'com.google.firebase:firebase-core:16.0.3'
implementation 'com.google.firebase:firebase-analytics:16.0.3'
Expand Down
2 changes: 1 addition & 1 deletion ...s/app/src/androidTest/java/com/google/firebase/quickstart/analytics/MainActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.support.test.espresso.ViewInteraction;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import android.support.test.filters.LargeTest;

import com.google.firebase.quickstart.analytics.java.MainActivity;

Expand Down
2 changes: 1 addition & 1 deletion analytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:4.1.0'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion analytics/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
12 changes: 6 additions & 6 deletions app-indexing/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
applicationId "com.google.samples.quickstart.app_indexing"
minSdkVersion 18
targetSdkVersion 27
targetSdkVersion 28
versionCode 2
versionName "1.0"

Expand All @@ -24,20 +24,20 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
}

dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooser")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
// [START app_indexing_gradle_dep]
implementation 'com.google.firebase:firebase-appindexing:16.0.1'
// [END app_indexing_gradle_dep]
implementation 'com.google.firebase:firebase-core:16.0.3'

implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'

// Testing
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
2 changes: 1 addition & 1 deletion app-indexing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:4.1.0'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion app-indexing/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
19 changes: 10 additions & 9 deletions auth/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
check.dependsOn 'assembleDebugAndroidTest'

android {
compileSdkVersion 27
compileSdkVersion 28
flavorDimensions "minSdkVersion"

defaultConfig {
applicationId "com.google.firebase.quickstart.auth"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand All @@ -30,7 +30,7 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
}

dependencies {
Expand All @@ -39,10 +39,11 @@ dependencies {
implementation 'com.android.support:multidex:1.0.3'

implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:animated-vector-drawable:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:animated-vector-drawable:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'

// Firebase Authentication
implementation 'com.google.firebase:firebase-core:16.0.3'
Expand All @@ -57,8 +58,8 @@ dependencies {

// Facebook Android SDK (only required for Facebook Login)
// Used in FacebookLoginActivity.
implementation 'com.facebook.android:facebook-login:4.36.0'
implementation 'com.android.support:customtabs:27.1.1'
implementation 'com.facebook.android:facebook-login:4.36.1'
implementation 'com.android.support:customtabs:28.0.0'

// Twitter Android SDK (only required for Twitter Login)
implementation 'com.twitter.sdk.android:twitter-core:3.3.0'
Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.support.test.espresso.NoMatchingViewException;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import android.support.test.filters.LargeTest;

import com.google.firebase.quickstart.auth.java.AnonymousAuthActivity;

Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/EmailPasswordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.support.test.espresso.ViewInteraction;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import android.support.test.filters.LargeTest;

import com.google.firebase.quickstart.auth.java.EmailPasswordActivity;

Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class FacebookLoginActivity : BaseActivity(), View.OnClickListener {
// [END on_start_check_user]

// [START on_activity_result]
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)

// Pass the activity result back to the Facebook SDK
Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class FirebaseUIActivity : AppCompatActivity(), View.OnClickListener {
updateUI(mAuth.currentUser)
}

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)

if (requestCode == RC_SIGN_IN) {
Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class GoogleSignInActivity : BaseActivity(), View.OnClickListener {
// [END on_start_check_user]

// [START onactivityresult]
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)

// Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
Expand Down
2 changes: 1 addition & 1 deletion auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/TwitterLoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class TwitterLoginActivity : BaseActivity(), View.OnClickListener {
// [END on_start_check_user]

// [START on_activity_result]
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)

// Pass the activity result to the Twitter login button.
Expand Down
2 changes: 1 addition & 1 deletion auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:4.1.0'
}
}
Expand Down
2 changes: 1 addition & 1 deletion auth/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71'

classpath 'com.google.gms:google-services:4.1.0'
classpath 'com.google.firebase:firebase-plugins:1.1.5'
classpath 'io.fabric.tools:gradle:1.25.4'
classpath 'io.fabric.tools:gradle:1.26.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
12 changes: 6 additions & 6 deletions config/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
check.dependsOn 'assembleDebugAndroidTest'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
applicationId "com.google.samples.quickstart.config"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"

Expand All @@ -25,16 +25,16 @@ android {
}

configurations.all {
resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
}

dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooser")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"

implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'

implementation 'com.google.firebase:firebase-core:16.0.3'
implementation 'com.google.firebase:firebase-config:16.0.0'
Expand Down
2 changes: 1 addition & 1 deletion config/app/src/androidTest/java/com/google/samples/quickstart/config/MainActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import android.support.test.filters.LargeTest;

import com.google.samples.quickstart.config.java.MainActivity;

Expand Down
2 changes: 1 addition & 1 deletion config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:4.1.0'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion config/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
Loading