Skip to content

Commit 3b3903d

Browse files
samtsternsamtstern
authored
Update all dependencies (firebase#338)
1 parent 31f4b1a commit 3b3903d

File tree

35 files changed

+161
-159
lines changed

35 files changed

+161
-159
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ cache:
2020
- $HOME/.android/build-cache
2121

2222
before_script:
23-
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository"
23+
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
2424
script: ./build.sh

‎admob/app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
55
compileSdkVersion 26
6-
buildToolsVersion "25.0.3"
6+
buildToolsVersion "26.0.1"
77

88
defaultConfig {
99
applicationId "com.google.samples.quickstart.admobexample"
1010
minSdkVersion 14
11-
targetSdkVersion 25
11+
targetSdkVersion 26
1212
versionCode 1
1313
versionName "1.0"
1414

@@ -28,15 +28,14 @@ android {
2828
}
2929

3030
configurations.all {
31-
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
31+
resolutionStrategy.force 'com.android.support:support-annotations:26.1.0'
3232
}
3333

3434
dependencies {
35-
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile 'com.android.support:appcompat-v7:26.0.0'
35+
compile 'com.android.support:appcompat-v7:26.1.0'
3736

3837
// [START gradle_play_config]
39-
compile 'com.google.firebase:firebase-ads:11.2.0'
38+
compile 'com.google.firebase:firebase-ads:11.4.0'
4039
// [END gradle_play_config]
4140

4241
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎admob/app/src/main/java/com/google/samples/quickstart/admobexample/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
4747
super.onCreate(savedInstanceState);
4848
setContentView(R.layout.activity_main);
4949

50-
mAdView = (AdView) findViewById(R.id.adView);
50+
mAdView = findViewById(R.id.adView);
5151
AdRequest adRequest = new AdRequest.Builder().build();
5252
mAdView.loadAd(adRequest);
5353
// [END load_banner_ad]
@@ -91,7 +91,7 @@ public void onAdFailedToLoad(int i) {
9191
// [END create_interstitial_ad_listener]
9292

9393
// [START display_interstitial_ad]
94-
mLoadInterstitialButton = (Button) findViewById(R.id.load_interstitial_button);
94+
mLoadInterstitialButton = findViewById(R.id.load_interstitial_button);
9595
mLoadInterstitialButton.setOnClickListener(new View.OnClickListener() {
9696
@Override
9797
public void onClick(View v) {

‎analytics/app/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
55
compileSdkVersion 26
6-
buildToolsVersion "25.0.3"
6+
buildToolsVersion "26.0.1"
77

88
defaultConfig {
99
applicationId "com.google.firebase.quickstart.analytics"
1010
minSdkVersion 14
11-
targetSdkVersion 25
11+
targetSdkVersion 26
1212
versionCode 1
1313
versionName "1.0"
1414
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -23,15 +23,14 @@ android {
2323
}
2424

2525
configurations.all {
26-
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
26+
resolutionStrategy.force 'com.android.support:support-annotations:26.1.0'
2727
}
2828

2929
dependencies {
30-
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile 'com.android.support:appcompat-v7:26.0.0'
32-
compile 'com.android.support:support-v4:26.0.0'
30+
compile 'com.android.support:appcompat-v7:26.1.0'
31+
compile 'com.android.support:support-v4:26.1.0'
3332

34-
compile 'com.google.firebase:firebase-analytics:11.2.0'
33+
compile 'com.google.firebase:firebase-analytics:11.4.0'
3534

3635
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
3736
androidTestCompile 'com.android.support.test:runner:0.5'

‎analytics/app/src/main/java/com/google/firebase/quickstart/analytics/ImageFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public View onCreateView(LayoutInflater inflater,
6363
ViewGroup container,
6464
Bundle savedInstanceState) {
6565
View view = inflater.inflate(R.layout.fragment_main, null);
66-
ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
66+
ImageView imageView = view.findViewById(R.id.imageView);
6767
imageView.setImageResource(resId);
6868

6969
return view;

‎analytics/app/src/main/java/com/google/firebase/quickstart/analytics/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected void onCreate(Bundle savedInstanceState) {
102102
mImagePagerAdapter = new ImagePagerAdapter(getSupportFragmentManager(), IMAGE_INFOS);
103103

104104
// Set up the ViewPager with the pattern adapter.
105-
mViewPager = (ViewPager) findViewById(R.id.pager);
105+
mViewPager = findViewById(R.id.pager);
106106
mViewPager.setAdapter(mImagePagerAdapter);
107107

108108
// Workaround for AppCompat issue not showing ViewPager titles

‎app-indexing/app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
55
compileSdkVersion 26
6-
buildToolsVersion "25.0.3"
6+
buildToolsVersion "26.0.1"
77

88
defaultConfig {
99
applicationId "com.google.samples.quickstart.app_indexing"
1010
minSdkVersion 18
11-
targetSdkVersion 25
11+
targetSdkVersion 26
1212
versionCode 2
1313
versionName "1.0"
1414

@@ -23,16 +23,16 @@ android {
2323
}
2424

2525
configurations.all {
26-
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
26+
resolutionStrategy.force 'com.android.support:support-annotations:26.1.0'
2727
}
2828

2929
dependencies {
3030
// [START app_indexing_gradle_dep]
31-
compile 'com.google.firebase:firebase-appindexing:11.2.0'
31+
compile 'com.google.firebase:firebase-appindexing:11.4.0'
3232
// [END app_indexing_gradle_dep]
3333

34-
compile 'com.android.support:support-v4:26.0.0'
35-
compile 'com.android.support:appcompat-v7:26.0.0'
34+
compile 'com.android.support:support-v4:26.1.0'
35+
compile 'com.android.support:appcompat-v7:26.1.0'
3636

3737
// Testing
3838
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎auth/app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ check.dependsOn 'assembleMinSdkJellybeanDebugAndroidTest', 'assembleMinSdkIcsDeb
33

44
android {
55
compileSdkVersion 26
6-
buildToolsVersion "25.0.3"
6+
buildToolsVersion "26.0.1"
77
flavorDimensions "minSdkVersion"
88

99
defaultConfig {
1010
applicationId "com.google.firebase.quickstart.auth"
1111
minSdkVersion 14
12-
targetSdkVersion 25
12+
targetSdkVersion 26
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -44,37 +44,37 @@ android {
4444
}
4545

4646
configurations.all {
47-
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
47+
resolutionStrategy.force 'com.android.support:support-annotations:26.1.0'
4848
}
4949

5050
dependencies {
51-
compile 'com.android.support:appcompat-v7:26.0.0'
52-
compile 'com.android.support:animated-vector-drawable:26.0.0'
53-
compile 'com.android.support:cardview-v7:26.0.0'
54-
compile 'com.android.support:design:26.0.0'
51+
compile 'com.android.support:appcompat-v7:26.1.0'
52+
compile 'com.android.support:animated-vector-drawable:26.1.0'
53+
compile 'com.android.support:cardview-v7:26.1.0'
54+
compile 'com.android.support:design:26.1.0'
5555

5656
// Firebase Authentication
57-
compile 'com.google.firebase:firebase-auth:11.2.0'
57+
compile 'com.google.firebase:firebase-auth:11.4.0'
5858

5959
// Google Sign In SDK (only required for Google Sign In)
60-
compile 'com.google.android.gms:play-services-auth:11.2.0'
60+
compile 'com.google.android.gms:play-services-auth:11.4.0'
6161

6262
// Firebase UI
6363
// Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16
6464
// so this library is only included in the minSdkJellybean variant.
65-
minSdkJellybeanCompile 'com.firebaseui:firebase-ui-auth:1.2.0'
65+
minSdkJellybeanCompile 'com.firebaseui:firebase-ui-auth:2.3.0'
6666

6767
// Facebook Android SDK (only required for Facebook Login)
6868
// Used in FacebookLoginActivity. This is only compiled into the minSdkJellybean variant of this
6969
// app. You can build a 'minSdkGingerbread' variant to test on devices with 9 <= SDK <= 15.
70-
minSdkJellybeanCompile 'com.facebook.android:facebook-android-sdk:4.9.0'
71-
minSdkJellybeanCompile 'com.android.support:customtabs:26.0.0'
70+
minSdkJellybeanCompile 'com.facebook.android:facebook-android-sdk:4.25.0'
71+
minSdkJellybeanCompile 'com.android.support:customtabs:26.1.0'
7272

7373
// Twitter Android SDK (only required for Twitter Login)
74-
compile('com.twitter.sdk.android:twitter-core:1.6.6@aar') {
74+
compile('com.twitter.sdk.android:twitter-core:2.3.0@aar') {
7575
transitive = true
7676
}
77-
compile('com.twitter.sdk.android:twitter:1.13.1@aar') {
77+
compile('com.twitter.sdk.android:twitter:3.1.1@aar') {
7878
transitive = true
7979
}
8080

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/AnonymousAuthActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
5858
// [END initialize_auth]
5959

6060
// Fields
61-
mEmailField = (EditText) findViewById(R.id.field_email);
62-
mPasswordField = (EditText) findViewById(R.id.field_password);
61+
mEmailField = findViewById(R.id.field_email);
62+
mPasswordField = findViewById(R.id.field_password);
6363

6464
// Click listeners
6565
findViewById(R.id.button_anonymous_sign_in).setOnClickListener(this);
@@ -175,8 +175,8 @@ private boolean validateLinkForm() {
175175
private void updateUI(FirebaseUser user) {
176176
hideProgressDialog();
177177

178-
TextView idView = (TextView) findViewById(R.id.anonymous_status_id);
179-
TextView emailView = (TextView) findViewById(R.id.anonymous_status_email);
178+
TextView idView = findViewById(R.id.anonymous_status_id);
179+
TextView emailView = findViewById(R.id.anonymous_status_email);
180180
boolean isSignedIn = (user != null);
181181

182182
// Status text

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/ChooserActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
7070
setContentView(R.layout.activity_chooser);
7171

7272
// Set up ListView and Adapter
73-
ListView listView = (ListView) findViewById(R.id.list_view);
73+
ListView listView = findViewById(R.id.list_view);
7474

7575
MyArrayAdapter adapter = new MyArrayAdapter(this, android.R.layout.simple_list_item_2, CLASSES);
7676
adapter.setDescriptionIds(DESCRIPTION_IDS);

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/EmailPasswordActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public void onCreate(Bundle savedInstanceState) {
5151
setContentView(R.layout.activity_emailpassword);
5252

5353
// Views
54-
mStatusTextView = (TextView) findViewById(R.id.status);
55-
mDetailTextView = (TextView) findViewById(R.id.detail);
56-
mEmailField = (EditText) findViewById(R.id.field_email);
57-
mPasswordField = (EditText) findViewById(R.id.field_password);
54+
mStatusTextView = findViewById(R.id.status);
55+
mDetailTextView = findViewById(R.id.detail);
56+
mEmailField = findViewById(R.id.field_email);
57+
mPasswordField = findViewById(R.id.field_password);
5858

5959
// Buttons
6060
findViewById(R.id.email_sign_in_button).setOnClickListener(this);

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/GoogleSignInActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ protected void onCreate(Bundle savedInstanceState) {
6464
setContentView(R.layout.activity_google);
6565

6666
// Views
67-
mStatusTextView = (TextView) findViewById(R.id.status);
68-
mDetailTextView = (TextView) findViewById(R.id.detail);
67+
mStatusTextView = findViewById(R.id.status);
68+
mDetailTextView = findViewById(R.id.detail);
6969

7070
// Button listeners
7171
findViewById(R.id.sign_in_button).setOnClickListener(this);

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/PhoneAuthActivity.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ protected void onCreate(Bundle savedInstanceState) {
7373
}
7474

7575
// Assign views
76-
mPhoneNumberViews = (ViewGroup) findViewById(R.id.phone_auth_fields);
77-
mSignedInViews = (ViewGroup) findViewById(R.id.signed_in_buttons);
76+
mPhoneNumberViews = findViewById(R.id.phone_auth_fields);
77+
mSignedInViews = findViewById(R.id.signed_in_buttons);
7878

79-
mStatusText = (TextView) findViewById(R.id.status);
80-
mDetailText = (TextView) findViewById(R.id.detail);
79+
mStatusText = findViewById(R.id.status);
80+
mDetailText = findViewById(R.id.detail);
8181

82-
mPhoneNumberField = (EditText) findViewById(R.id.field_phone_number);
83-
mVerificationField = (EditText) findViewById(R.id.field_verification_code);
82+
mPhoneNumberField = findViewById(R.id.field_phone_number);
83+
mVerificationField = findViewById(R.id.field_verification_code);
8484

85-
mStartButton = (Button) findViewById(R.id.button_start_verification);
86-
mVerifyButton = (Button) findViewById(R.id.button_verify_phone);
87-
mResendButton = (Button) findViewById(R.id.button_resend);
88-
mSignOutButton = (Button) findViewById(R.id.sign_out_button);
85+
mStartButton = findViewById(R.id.button_start_verification);
86+
mVerifyButton = findViewById(R.id.button_verify_phone);
87+
mResendButton = findViewById(R.id.button_resend);
88+
mSignOutButton = findViewById(R.id.sign_out_button);
8989

9090
// Assign click listeners
9191
mStartButton.setOnClickListener(this);
@@ -340,7 +340,7 @@ private void updateUI(int uiState, FirebaseUser user, PhoneAuthCredential cred)
340340
mPhoneNumberViews.setVisibility(View.VISIBLE);
341341
mSignedInViews.setVisibility(View.GONE);
342342

343-
mStatusText.setText(R.string.signed_out);;
343+
mStatusText.setText(R.string.signed_out);
344344
} else {
345345
// Signed in
346346
mPhoneNumberViews.setVisibility(View.GONE);

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/TwitterLoginActivity.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
import com.google.firebase.auth.FirebaseAuth;
1616
import com.google.firebase.auth.FirebaseUser;
1717
import com.google.firebase.auth.TwitterAuthProvider;
18-
import com.twitter.sdk.android.Twitter;
1918
import com.twitter.sdk.android.core.Callback;
2019
import com.twitter.sdk.android.core.Result;
20+
import com.twitter.sdk.android.core.Twitter;
2121
import com.twitter.sdk.android.core.TwitterAuthConfig;
22+
import com.twitter.sdk.android.core.TwitterConfig;
23+
import com.twitter.sdk.android.core.TwitterCore;
2224
import com.twitter.sdk.android.core.TwitterException;
2325
import com.twitter.sdk.android.core.TwitterSession;
2426
import com.twitter.sdk.android.core.identity.TwitterLoginButton;
2527

26-
import io.fabric.sdk.android.Fabric;
27-
2828
public class TwitterLoginActivity extends BaseActivity
2929
implements View.OnClickListener {
3030

@@ -47,14 +47,19 @@ protected void onCreate(Bundle savedInstanceState) {
4747
TwitterAuthConfig authConfig = new TwitterAuthConfig(
4848
getString(R.string.twitter_consumer_key),
4949
getString(R.string.twitter_consumer_secret));
50-
Fabric.with(this, new Twitter(authConfig));
50+
51+
TwitterConfig twitterConfig = new TwitterConfig.Builder(this)
52+
.twitterAuthConfig(authConfig)
53+
.build();
54+
55+
Twitter.initialize(twitterConfig);
5156

5257
// Inflate layout (must be done after Twitter is configured)
5358
setContentView(R.layout.activity_twitter);
5459

5560
// Views
56-
mStatusTextView = (TextView) findViewById(R.id.status);
57-
mDetailTextView = (TextView) findViewById(R.id.detail);
61+
mStatusTextView = findViewById(R.id.status);
62+
mDetailTextView = findViewById(R.id.detail);
5863
findViewById(R.id.button_twitter_signout).setOnClickListener(this);
5964

6065
// [START initialize_auth]
@@ -63,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
6368
// [END initialize_auth]
6469

6570
// [START initialize_twitter_login]
66-
mLoginButton = (TwitterLoginButton) findViewById(R.id.button_twitter_login);
71+
mLoginButton = findViewById(R.id.button_twitter_login);
6772
mLoginButton.setCallback(new Callback<TwitterSession>() {
6873
@Override
6974
public void success(Result<TwitterSession> result) {
@@ -138,7 +143,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
138143

139144
private void signOut() {
140145
mAuth.signOut();
141-
Twitter.logOut();
146+
TwitterCore.getInstance().getSessionManager().clearActiveSession();
142147

143148
updateUI(null);
144149
}

‎auth/app/src/minSdkJellybean/java/com/google/firebase/quickstart/auth/FacebookLoginActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public void onCreate(Bundle savedInstanceState) {
6565
setContentView(R.layout.activity_facebook);
6666

6767
// Views
68-
mStatusTextView = (TextView) findViewById(R.id.status);
69-
mDetailTextView = (TextView) findViewById(R.id.detail);
68+
mStatusTextView = findViewById(R.id.status);
69+
mDetailTextView = findViewById(R.id.detail);
7070
findViewById(R.id.button_facebook_signout).setOnClickListener(this);
7171

7272
// [START initialize_auth]
@@ -77,7 +77,7 @@ public void onCreate(Bundle savedInstanceState) {
7777
// [START initialize_fblogin]
7878
// Initialize Facebook Login button
7979
mCallbackManager = CallbackManager.Factory.create();
80-
LoginButton loginButton = (LoginButton) findViewById(R.id.button_facebook_login);
80+
LoginButton loginButton = findViewById(R.id.button_facebook_login);
8181
loginButton.setReadPermissions("email", "public_profile");
8282
loginButton.registerCallback(mCallbackManager, new FacebookCallback<LoginResult>() {
8383
@Override

0 commit comments

Comments
 (0)