File tree Expand file tree Collapse file tree 10 files changed +16
-16
lines changed
src/main/java/com/firebase/ui/auth Expand file tree Collapse file tree 10 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -51,8 +51,8 @@ dependencies {
51
51
compile " com.android.support:cardview-v7:$support_library_version "
52
52
53
53
testCompile ' junit:junit:4.12'
54
- // noinspection GradleDynamicVersion
55
- testCompile ' org.mockito:mockito-core:2.3 .+'
54
+ // noinspection NewerVersionAvailable, GradleDynamicVersion
55
+ testCompile ' org.mockito:mockito-core:2.5 .+'
56
56
testCompile ' org.robolectric:robolectric:3.1.4'
57
57
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
58
58
testCompile ' org.khronos:opengl-api:gl1.1-android-2.1_r1'
Original file line number Diff line number Diff line change 5
5
import android .support .annotation .Nullable ;
6
6
import android .support .v4 .app .DialogFragment ;
7
7
8
- public class BaseDialog extends DialogFragment {
8
+ public class DialogBase extends DialogFragment {
9
9
protected FragmentHelper mHelper ;
10
10
11
11
@ Override
Original file line number Diff line number Diff line change 5
5
import android .support .annotation .Nullable ;
6
6
import android .support .v4 .app .Fragment ;
7
7
8
- public class BaseFragment extends Fragment {
8
+ public class FragmentBase extends Fragment {
9
9
protected FragmentHelper mHelper ;
10
10
11
11
@ Override
Original file line number Diff line number Diff line change 16
16
import android .widget .EditText ;
17
17
18
18
import com .firebase .ui .auth .R ;
19
- import com .firebase .ui .auth .ui .BaseFragment ;
20
19
import com .firebase .ui .auth .ui .ExtraConstants ;
21
20
import com .firebase .ui .auth .ui .FlowParameters ;
21
+ import com .firebase .ui .auth .ui .FragmentBase ;
22
22
import com .firebase .ui .auth .ui .TaskFailureLogger ;
23
23
import com .firebase .ui .auth .ui .User ;
24
24
import com .firebase .ui .auth .ui .email .fieldvalidators .EmailFieldValidator ;
43
43
*
44
44
* Host Activities should implement {@link CheckEmailListener}.
45
45
*/
46
- public class CheckEmailFragment extends BaseFragment implements View .OnClickListener {
46
+ public class CheckEmailFragment extends FragmentBase implements View .OnClickListener {
47
47
48
48
/**
49
49
* Interface to be implemented by Activities hosting this Fragment.
Original file line number Diff line number Diff line change 10
10
11
11
import com .firebase .ui .auth .R ;
12
12
import com .firebase .ui .auth .ResultCodes ;
13
- import com .firebase .ui .auth .ui .BaseDialog ;
13
+ import com .firebase .ui .auth .ui .DialogBase ;
14
14
import com .firebase .ui .auth .ui .ExtraConstants ;
15
15
16
- public class RecoveryEmailSentDialog extends BaseDialog {
16
+ public class RecoveryEmailSentDialog extends DialogBase {
17
17
private static final String TAG = "RecoveryEmailSentDialog" ;
18
18
19
19
@ NonNull
Original file line number Diff line number Diff line change 20
20
21
21
import com .firebase .ui .auth .IdpResponse ;
22
22
import com .firebase .ui .auth .R ;
23
- import com .firebase .ui .auth .ui .BaseFragment ;
24
23
import com .firebase .ui .auth .ui .ExtraConstants ;
25
24
import com .firebase .ui .auth .ui .FlowParameters ;
25
+ import com .firebase .ui .auth .ui .FragmentBase ;
26
26
import com .firebase .ui .auth .ui .TaskFailureLogger ;
27
27
import com .firebase .ui .auth .ui .User ;
28
28
import com .firebase .ui .auth .ui .email .fieldvalidators .EmailFieldValidator ;
44
44
/**
45
45
* Fragment to display an email/name/password sign up form for new users.
46
46
*/
47
- public class RegisterEmailFragment extends BaseFragment implements
47
+ public class RegisterEmailFragment extends FragmentBase implements
48
48
View .OnClickListener , View .OnFocusChangeListener {
49
49
50
50
public static final String TAG = "RegisterEmailFragment" ;
Original file line number Diff line number Diff line change 32
32
import com .firebase .ui .auth .provider .IdpProvider ;
33
33
import com .firebase .ui .auth .provider .IdpProvider .IdpCallback ;
34
34
import com .firebase .ui .auth .provider .TwitterProvider ;
35
- import com .firebase .ui .auth .ui .BaseFragment ;
36
35
import com .firebase .ui .auth .ui .ExtraConstants ;
37
36
import com .firebase .ui .auth .ui .FlowParameters ;
37
+ import com .firebase .ui .auth .ui .FragmentBase ;
38
38
import com .firebase .ui .auth .ui .FragmentHelper ;
39
39
import com .firebase .ui .auth .ui .TaskFailureLogger ;
40
40
import com .firebase .ui .auth .ui .User ;
44
44
import com .google .firebase .auth .GoogleAuthProvider ;
45
45
import com .google .firebase .auth .TwitterAuthProvider ;
46
46
47
- public class IdpSignInContainer extends BaseFragment implements IdpCallback {
47
+ public class IdpSignInContainer extends FragmentBase implements IdpCallback {
48
48
private static final String TAG = "IDPSignInContainer" ;
49
49
private static final int RC_WELCOME_BACK_IDP = 4 ;
50
50
Original file line number Diff line number Diff line change 7
7
import android .util .Log ;
8
8
import android .widget .Toast ;
9
9
10
- import com .firebase .ui .auth .ui .BaseFragment ;
10
+ import com .firebase .ui .auth .ui .FragmentBase ;
11
11
import com .google .android .gms .auth .api .credentials .Credential ;
12
12
import com .google .android .gms .auth .api .credentials .IdentityProviders ;
13
13
import com .google .android .gms .common .ConnectionResult ;
25
25
import java .util .Collections ;
26
26
import java .util .List ;
27
27
28
- public abstract class SmartLockBase <R extends Result > extends BaseFragment implements
28
+ public abstract class SmartLockBase <R extends Result > extends FragmentBase implements
29
29
GoogleApiClient .ConnectionCallbacks ,
30
30
ResultCallback <R >,
31
31
GoogleApiClient .OnConnectionFailedListener {
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ buildscript {
8
8
}
9
9
10
10
dependencies {
11
- classpath ' com.android.tools.build:gradle:2.3.0-alpha2 '
11
+ classpath ' com.android.tools.build:gradle:2.3.0-beta1 '
12
12
classpath ' com.google.gms:google-services:3.0.0'
13
13
classpath ' io.fabric.tools:gradle:1.+'
14
14
classpath ' com.neenbedankt.gradle.plugins:android-apt:1.8'
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ task pmd(type: Pmd) {
69
69
70
70
android {
71
71
lintOptions {
72
- disable ' InvalidPackage'
72
+ disable ' InvalidPackage' , ' RestrictedApi '
73
73
baseline file(" $configDir /lint-baseline.xml" )
74
74
checkAllWarnings true
75
75
warningsAsErrors true
You can’t perform that action at this time.
0 commit comments