Skip to content

Commit 510e637

Browse files
committed
Gradle updates | Check Play Services
1 parent 579144d commit 510e637

File tree

4 files changed

+44
-39
lines changed

4 files changed

+44
-39
lines changed

app/build.gradle

+16-25
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
apply plugin: 'com.android.application'
2-
3-
apply plugin: 'me.tatarka.retrolambda'
4-
52
apply plugin: 'kotlin-android'
63

74
buildscript {
85
repositories {
96
mavenCentral()
107
}
11-
dependencies {
12-
classpath 'me.tatarka:gradle-retrolambda:3.5.0'
13-
}
148
}
159

1610
android {
1711
compileOptions {
1812
sourceCompatibility JavaVersion.VERSION_1_8
1913
targetCompatibility JavaVersion.VERSION_1_8
2014
}
21-
compileSdkVersion 25
22-
buildToolsVersion "25.0.2"
15+
compileSdkVersion 27
16+
buildToolsVersion "27.0.2"
2317
dataBinding {
2418
enabled true
2519
}
2620
defaultConfig {
2721
vectorDrawables.useSupportLibrary = true
2822
applicationId "com.myhexaville.tictactoe"
2923
minSdkVersion 16
30-
targetSdkVersion 25
24+
targetSdkVersion 27
3125
versionCode 1
3226
versionName "1.0"
3327
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -38,14 +32,6 @@ android {
3832
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3933
}
4034
}
41-
productFlavors {
42-
modern {
43-
minSdkVersion 21
44-
}
45-
legacy {
46-
minSdkVersion 16
47-
}
48-
}
4935
}
5036

5137
kapt {
@@ -54,23 +40,28 @@ kapt {
5440

5541
dependencies {
5642
compile fileTree(dir: 'libs', include: ['*.jar'])
43+
testCompile 'junit:junit:4.12'
5744
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
5845
exclude group: 'com.android.support', module: 'support-annotations'
5946
})
6047
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
6148

6249

6350
compile 'com.facebook.android:facebook-android-sdk:4.16.1'
51+
6452
compile 'io.reactivex.rxjava2:rxjava:2.0.5'
6553
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
66-
compile 'com.android.support:appcompat-v7:25.3.1'
67-
compile 'com.android.support:design:25.3.1'
68-
compile 'com.google.firebase:firebase-database:10.2.0'
69-
compile 'com.google.firebase:firebase-messaging:10.2.0'
70-
compile 'com.google.firebase:firebase-auth:10.2.0'
71-
compile 'com.squareup.okhttp3:okhttp:3.8.0'
54+
55+
compile "com.android.support:appcompat-v7:$support_version"
56+
compile "com.android.support:design:$support_version"
57+
58+
compile 'com.google.firebase:firebase-database:11.8.0'
59+
compile 'com.google.firebase:firebase-messaging:11.8.0'
60+
compile 'com.google.firebase:firebase-auth:11.8.0'
61+
62+
compile 'com.squareup.okhttp3:okhttp:3.9.1'
7263
compile 'com.android.support.constraint:constraint-layout:1.0.2'
73-
testCompile 'junit:junit:4.12'
74-
kapt 'com.android.databinding:compiler:2.3.1'
64+
65+
kapt 'com.android.databinding:compiler:3.0.1'
7566
}
7667
apply plugin: 'com.google.gms.google-services'

app/src/main/java/com/myhexaville/tictactoe/StartActivity.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@
33
import android.content.Intent;
44
import android.databinding.DataBindingUtil;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
76
import android.support.v7.app.AppCompatActivity;
87
import android.util.Log;
98
import android.util.Patterns;
109
import android.view.View;
1110
import android.widget.Toast;
1211

13-
import com.facebook.AccessToken;
14-
import com.google.android.gms.tasks.OnCompleteListener;
15-
import com.google.android.gms.tasks.Task;
16-
import com.google.firebase.auth.AuthCredential;
17-
import com.google.firebase.auth.AuthResult;
18-
import com.google.firebase.auth.FacebookAuthProvider;
12+
import com.google.android.gms.common.ConnectionResult;
13+
import com.google.android.gms.common.GoogleApiAvailability;
1914
import com.google.firebase.auth.FirebaseAuth;
2015
import com.google.firebase.auth.FirebaseUser;
2116
import com.google.firebase.database.FirebaseDatabase;
@@ -40,7 +35,6 @@ public class StartActivity extends AppCompatActivity {
4035
protected void onCreate(Bundle savedInstanceState) {
4136
super.onCreate(savedInstanceState);
4237
binding = DataBindingUtil.setContentView(this, R.layout.activity_start);
43-
4438
}
4539

4640
public void startSingleMode(View view) {
@@ -49,6 +43,9 @@ public void startSingleMode(View view) {
4943
}
5044

5145
public void startMultilayer(View view) {
46+
if (!arePlayServicesOk()) {
47+
return;
48+
}
5249
if (isAnonymous()) {
5350
binding.inputEmail.setVisibility(VISIBLE);
5451
binding.inputName.setVisibility(VISIBLE);
@@ -136,4 +133,18 @@ private boolean isAnonymous() {
136133
FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
137134
return currentUser == null || currentUser.isAnonymous();
138135
}
136+
137+
private boolean arePlayServicesOk() {
138+
final GoogleApiAvailability googleAPI = GoogleApiAvailability.getInstance();
139+
final int resultCode = googleAPI.isGooglePlayServicesAvailable(this);
140+
141+
if (resultCode != ConnectionResult.SUCCESS) {
142+
if (googleAPI.isUserResolvableError(resultCode)) {
143+
googleAPI.getErrorDialog(this, resultCode, 5000).show();
144+
}
145+
return false;
146+
}
147+
148+
return true;
149+
}
139150
}

build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.0.6'
5-
ext.support_version = '25.1.0'
4+
ext.kotlin_version = '1.2.0'
5+
ext.support_version = '27.0.2'
66
repositories {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:2.3.1'
11-
classpath 'com.google.gms:google-services:3.0.0'
10+
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath 'com.google.gms:google-services:3.1.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong
@@ -19,6 +19,9 @@ buildscript {
1919
allprojects {
2020
repositories {
2121
jcenter()
22+
maven { url "https://jitpack.io" }
23+
maven { url "https://maven.google.com" }
24+
google()
2225
}
2326
}
2427

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue May 09 20:29:45 CEST 2017
1+
#Mon Jan 22 19:57:58 CET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)