Skip to content

Commit a4ff139

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge
2 parents de30749 + d9ed980 commit a4ff139

File tree

365 files changed

+940
-6598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+940
-6598
lines changed

‎buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class FirebaseTestServer extends TestServer {
5454
'--type=instrumentation',
5555
"--app=$testedApkPath", "--test=$testApk",
5656
'--no-auto-google-login', '--no-record-video', '--no-performance-metrics', '-q',
57+
"--results-history-name=$project.path",
5758
*resultsArgs, *devicesCmd)
5859
}
5960
}

‎default-preguard.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
55

66
# Keep the classes/members we need for client functionality.
7-
-keep @interface android.support.annotation.Keep
8-
-keep @android.support.annotation.Keep class *
7+
-keep @interface androidx.annotation.Keep
8+
-keep @androidx.annotation.Keep class *
99
-keepclasseswithmembers class * {
10-
@android.support.annotation.Keep <fields>;
10+
@androidx.annotation.Keep <fields>;
1111
}
1212
-keepclasseswithmembers class * {
13-
@android.support.annotation.Keep <methods>;
13+
@androidx.annotation.Keep <methods>;
1414
}
1515

1616
# Keep the classes/members we need for client functionality.
@@ -34,7 +34,7 @@
3434
}
3535

3636
# Keep Enum members implicitly
37-
-keepclassmembers @android.support.annotation.Keep public class * extends java.lang.Enum {
37+
-keepclassmembers @androidx.annotation.Keep public class * extends java.lang.Enum {
3838
public <fields>;
3939
public static **[] values();
4040
public static ** valueOf(java.lang.String);

‎fiamui-app/fiamui-app.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
targetSdkVersion project.targetSdkVersion
2525
versionCode 1
2626
versionName "1.0"
27-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
27+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2828
multiDexEnabled true
2929
}
3030

@@ -62,17 +62,20 @@ dependencies {
6262
}
6363

6464
implementation "com.android.installreferrer:installreferrer:1.0"
65-
implementation "com.android.support:design:27.1.1"
66-
implementation "com.android.support:appcompat-v7:27.1.1"
65+
implementation 'com.google.android.material:material:1.0.0'
66+
implementation 'androidx.appcompat:appcompat:1.0.2'
67+
implementation "com.google.code.findbugs:jsr305:3.0.2"
68+
implementation "com.squareup.okhttp:okhttp:2.7.5"
69+
implementation "com.google.auto.value:auto-value-annotations:1.6.5"
70+
implementation "com.google.android.gms:play-services-basement:16.2.0"
6771

6872
// The following dependencies are not required to use the FIAM UI library.
6973
// They are used to make some aspects of the demo app implementation simpler for
7074
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
7175
implementation 'me.priyesh:chroma:1.0.2'
72-
implementation "com.jakewharton:butterknife:8.8.1"
73-
implementation "com.jakewharton:butterknife-compiler:8.8.1"
74-
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
76+
implementation "com.jakewharton:butterknife:10.1.0"
77+
annotationProcessor "com.jakewharton:butterknife-compiler:10.1.0"
7578

76-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
77-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
79+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
80+
androidTestImplementation 'androidx.test:rules:1.2.0'
7881
}

‎fiamui-app/src/androidTest/java/com/example/firebase/fiamui/BannerTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414

1515
package com.example.firebase.fiamui;
1616

17-
import static android.support.test.espresso.Espresso.onView;
18-
import static android.support.test.espresso.action.ViewActions.click;
19-
import static android.support.test.espresso.action.ViewActions.scrollTo;
20-
import static android.support.test.espresso.action.ViewActions.swipeLeft;
21-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
22-
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
23-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
24-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
25-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
17+
import static androidx.test.espresso.Espresso.onView;
18+
import static androidx.test.espresso.action.ViewActions.click;
19+
import static androidx.test.espresso.action.ViewActions.scrollTo;
20+
import static androidx.test.espresso.action.ViewActions.swipeLeft;
21+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
22+
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
23+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
24+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
25+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
2626
import static com.example.firebase.fiamui.TestConstants.*;
2727
import static org.hamcrest.CoreMatchers.is;
2828
import static org.hamcrest.CoreMatchers.not;
2929

30-
import android.support.annotation.IdRes;
31-
import android.support.annotation.NonNull;
32-
import android.support.test.espresso.Root;
33-
import android.support.test.espresso.ViewInteraction;
34-
import android.support.test.filters.MediumTest;
35-
import android.support.test.rule.ActivityTestRule;
36-
import android.support.test.runner.AndroidJUnit4;
30+
import androidx.annotation.IdRes;
31+
import androidx.annotation.NonNull;
32+
import androidx.test.espresso.Root;
33+
import androidx.test.espresso.ViewInteraction;
34+
import androidx.test.filters.MediumTest;
35+
import androidx.test.rule.ActivityTestRule;
36+
import androidx.test.runner.AndroidJUnit4;
3737
import org.hamcrest.Matcher;
3838
import org.junit.After;
3939
import org.junit.Before;

‎fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ImageTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414

1515
package com.example.firebase.fiamui;
1616

17-
import static android.support.test.espresso.Espresso.onView;
18-
import static android.support.test.espresso.action.ViewActions.click;
19-
import static android.support.test.espresso.action.ViewActions.scrollTo;
20-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
21-
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
22-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
23-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
24-
import static org.hamcrest.CoreMatchers.is;
17+
import static androidx.test.espresso.Espresso.onView;
18+
import static androidx.test.espresso.action.ViewActions.click;
19+
import static androidx.test.espresso.action.ViewActions.scrollTo;
20+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
21+
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
22+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
23+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2524
import static org.hamcrest.CoreMatchers.not;
25+
import static org.hamcrest.core.Is.is;
2626

27-
import android.support.annotation.IdRes;
28-
import android.support.annotation.NonNull;
29-
import android.support.test.espresso.Root;
30-
import android.support.test.espresso.ViewInteraction;
31-
import android.support.test.filters.MediumTest;
32-
import android.support.test.rule.ActivityTestRule;
33-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.annotation.IdRes;
28+
import androidx.annotation.NonNull;
29+
import androidx.test.espresso.Root;
30+
import androidx.test.espresso.ViewInteraction;
31+
import androidx.test.filters.MediumTest;
32+
import androidx.test.rule.ActivityTestRule;
33+
import androidx.test.runner.AndroidJUnit4;
3434
import org.hamcrest.Matcher;
3535
import org.junit.After;
3636
import org.junit.Before;

‎fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ModalTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
package com.example.firebase.fiamui;
1616

17-
import static android.support.test.espresso.Espresso.onView;
18-
import static android.support.test.espresso.action.ViewActions.clearText;
19-
import static android.support.test.espresso.action.ViewActions.click;
20-
import static android.support.test.espresso.action.ViewActions.replaceText;
21-
import static android.support.test.espresso.action.ViewActions.scrollTo;
22-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
23-
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
24-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
25-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
26-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
17+
import static androidx.test.espresso.Espresso.onView;
18+
import static androidx.test.espresso.action.ViewActions.clearText;
19+
import static androidx.test.espresso.action.ViewActions.click;
20+
import static androidx.test.espresso.action.ViewActions.replaceText;
21+
import static androidx.test.espresso.action.ViewActions.scrollTo;
22+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
23+
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
24+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
25+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
26+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
2727
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_LONG;
2828
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_NONE;
2929
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_NORMAL;
@@ -36,14 +36,14 @@
3636
import static org.hamcrest.CoreMatchers.is;
3737
import static org.hamcrest.CoreMatchers.not;
3838

39-
import android.support.annotation.IdRes;
40-
import android.support.annotation.NonNull;
41-
import android.support.annotation.StringRes;
42-
import android.support.test.espresso.Root;
43-
import android.support.test.espresso.ViewInteraction;
44-
import android.support.test.filters.MediumTest;
45-
import android.support.test.rule.ActivityTestRule;
46-
import android.support.test.runner.AndroidJUnit4;
39+
import androidx.annotation.IdRes;
40+
import androidx.annotation.NonNull;
41+
import androidx.annotation.StringRes;
42+
import androidx.test.espresso.Root;
43+
import androidx.test.espresso.ViewInteraction;
44+
import androidx.test.filters.MediumTest;
45+
import androidx.test.rule.ActivityTestRule;
46+
import androidx.test.runner.AndroidJUnit4;
4747
import org.hamcrest.Matcher;
4848
import org.junit.After;
4949
import org.junit.Before;

‎fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ScreenShotter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package com.example.firebase.fiamui;
1616

1717
import android.graphics.Bitmap;
18-
import android.support.test.runner.screenshot.ScreenCapture;
19-
import android.support.test.runner.screenshot.Screenshot;
2018
import android.util.Log;
19+
import androidx.test.runner.screenshot.ScreenCapture;
20+
import androidx.test.runner.screenshot.Screenshot;
2121
import java.io.File;
2222
import java.io.FileOutputStream;
2323
import java.io.IOException;

‎fiamui-app/src/androidTest/java/com/example/firebase/fiamui/TestConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
package com.example.firebase.fiamui;
1616

17-
import android.support.annotation.IdRes;
18-
import android.support.annotation.StringRes;
17+
import androidx.annotation.IdRes;
18+
import androidx.annotation.StringRes;
1919

2020
public class TestConstants {
2121

‎fiamui-app/src/main/java/com/example/firebase/fiamui/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import android.graphics.drawable.ColorDrawable;
1818
import android.os.Bundle;
19-
import android.support.annotation.StringRes;
20-
import android.support.design.widget.TextInputEditText;
21-
import android.support.v7.app.AppCompatActivity;
2219
import android.view.View;
2320
import android.widget.Button;
2421
import android.widget.RadioButton;
22+
import androidx.annotation.StringRes;
23+
import androidx.appcompat.app.AppCompatActivity;
2524
import butterknife.BindView;
2625
import butterknife.ButterKnife;
2726
import butterknife.OnClick;
27+
import com.google.android.material.textfield.TextInputEditText;
2828
import com.google.firebase.analytics.FirebaseAnalytics;
2929
import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay;
3030
import com.google.firebase.inappmessaging.model.InAppMessage;

‎fiamui-app/src/main/java/com/example/firebase/fiamui/SampleApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package com.example.firebase.fiamui;
1616

17-
import android.support.multidex.MultiDexApplication;
17+
import androidx.multidex.MultiDexApplication;
1818

1919
public class SampleApplication extends MultiDexApplication {
2020
@Override

‎fiamui-app/src/main/java/com/example/firebase/fiamui/TestActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package com.example.firebase.fiamui;
1616

1717
import android.os.Bundle;
18-
import android.support.v7.app.AppCompatActivity;
18+
import androidx.appcompat.app.AppCompatActivity;
1919

2020
public class TestActivity extends AppCompatActivity {
2121
@Override

0 commit comments

Comments
 (0)