Skip to content

Migrate all libraries to jetpack. #502

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 9 commits into from
Jun 11, 2019
Merged

Migrate all libraries to jetpack. #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
337b39e
Migrate all libraries to jetpack.
vkryachko Jun 7, 2019
a5e2d4a
Change missed android.support references
vkryachko Jun 7, 2019
bf3211e
Pass project name to FTL for better resuls grouping.
vkryachko Jun 7, 2019
81c72bf
Remove test-apps
vkryachko Jun 7, 2019
e930139
Jettify smoke tests.
vkryachko Jun 7, 2019
fb81b0a
Upgrade to latest versions of androidx.
vkryachko Jun 7, 2019
1af106a
Update target sdk version
vkryachko Jun 7, 2019
9b2c63a
Merge branch 'master' into vk.jetpack_migration
vkryachko Jun 10, 2019
3632086
Remove deprecated warnings.
vkryachko Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions ...rc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class FirebaseTestServer extends TestServer {
'--type=instrumentation',
"--app=$testedApkPath", "--test=$testApk",
'--no-auto-google-login', '--no-record-video', '--no-performance-metrics', '-q',
"--results-history-name=$project.path",
*resultsArgs, *devicesCmd)
}
}
Expand Down
10 changes: 5 additions & 5 deletions default-preguard.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
SourceFile,LineNumberTable,*Annotation*,EnclosingMethod

# Keep the classes/members we need for client functionality.
-keep @interface android.support.annotation.Keep
-keep @android.support.annotation.Keep class *
-keep @interface androidx.annotation.Keep
-keep @androidx.annotation.Keep class *
-keepclasseswithmembers class * {
@android.support.annotation.Keep <fields>;
@androidx.annotation.Keep <fields>;
}
-keepclasseswithmembers class * {
@android.support.annotation.Keep <methods>;
@androidx.annotation.Keep <methods>;
}

# Keep the classes/members we need for client functionality.
Expand All @@ -34,7 +34,7 @@
}

# Keep Enum members implicitly
-keepclassmembers @android.support.annotation.Keep public class * extends java.lang.Enum {
-keepclassmembers @androidx.annotation.Keep public class * extends java.lang.Enum {
public <fields>;
public static **[] values();
public static ** valueOf(java.lang.String);
Expand Down
19 changes: 11 additions & 8 deletions fiamui-app/fiamui-app.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
targetSdkVersion project.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}

Expand Down Expand Up @@ -62,17 +62,20 @@ dependencies {
}

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

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

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
}
32 changes: 16 additions & 16 deletions fiamui-app/src/androidTest/java/com/example/firebase/fiamui/BannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@

package com.example.firebase.fiamui;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.scrollTo;
import static android.support.test.espresso.action.ViewActions.swipeLeft;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.scrollTo;
import static androidx.test.espresso.action.ViewActions.swipeLeft;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static com.example.firebase.fiamui.TestConstants.*;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;

import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.test.espresso.Root;
import android.support.test.espresso.ViewInteraction;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.test.espresso.Root;
import androidx.test.espresso.ViewInteraction;
import androidx.test.filters.MediumTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
Expand Down
30 changes: 15 additions & 15 deletions fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ImageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@

package com.example.firebase.fiamui;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.scrollTo;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.is;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.scrollTo;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.core.Is.is;

import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.test.espresso.Root;
import android.support.test.espresso.ViewInteraction;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.test.espresso.Root;
import androidx.test.espresso.ViewInteraction;
import androidx.test.filters.MediumTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
Expand Down
36 changes: 18 additions & 18 deletions fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ModalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@

package com.example.firebase.fiamui;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.clearText;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.replaceText;
import static android.support.test.espresso.action.ViewActions.scrollTo;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.clearText;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.replaceText;
import static androidx.test.espresso.action.ViewActions.scrollTo;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_LONG;
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_NONE;
import static com.example.firebase.fiamui.TestConstants.BODY_OPT_NORMAL;
Expand All @@ -36,14 +36,14 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;

import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.test.espresso.Root;
import android.support.test.espresso.ViewInteraction;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.test.espresso.Root;
import androidx.test.espresso.ViewInteraction;
import androidx.test.filters.MediumTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
Expand Down
4 changes: 2 additions & 2 deletions fiamui-app/src/androidTest/java/com/example/firebase/fiamui/ScreenShotter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package com.example.firebase.fiamui;

import android.graphics.Bitmap;
import android.support.test.runner.screenshot.ScreenCapture;
import android.support.test.runner.screenshot.Screenshot;
import android.util.Log;
import androidx.test.runner.screenshot.ScreenCapture;
import androidx.test.runner.screenshot.Screenshot;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions fiamui-app/src/androidTest/java/com/example/firebase/fiamui/TestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

package com.example.firebase.fiamui;

import android.support.annotation.IdRes;
import android.support.annotation.StringRes;
import androidx.annotation.IdRes;
import androidx.annotation.StringRes;

public class TestConstants {

Expand Down
6 changes: 3 additions & 3 deletions fiamui-app/src/main/java/com/example/firebase/fiamui/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.design.widget.TextInputEditText;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.RadioButton;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import com.google.android.material.textfield.TextInputEditText;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay;
import com.google.firebase.inappmessaging.model.InAppMessage;
Expand Down
2 changes: 1 addition & 1 deletion fiamui-app/src/main/java/com/example/firebase/fiamui/SampleApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package com.example.firebase.fiamui;

import android.support.multidex.MultiDexApplication;
import androidx.multidex.MultiDexApplication;

public class SampleApplication extends MultiDexApplication {
@Override
Expand Down
2 changes: 1 addition & 1 deletion fiamui-app/src/main/java/com/example/firebase/fiamui/TestActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package com.example.firebase.fiamui;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;

public class TestActivity extends AppCompatActivity {
@Override
Expand Down
Loading