fragment v4 add

pavel163 · Jan 8, 2017 · e0ca49c · e0ca49c
1 parent 317e87f
commit e0ca49c
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,10 +20,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.1.0'
+
     testCompile 'junit:junit:4.12'
     compile project(':google')
     compile project(':instagram')

diff --git a/facebook/build.gradle b/facebook/build.gradle
@@ -13,9 +13,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -27,9 +24,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     testCompile 'junit:junit:4.12'
 
     compile 'com.facebook.android:facebook-android-sdk:4.+'

diff --git a/facebook/src/main/java/com/ebr163/socialauth/facebook/FacebookClient.java b/facebook/src/main/java/com/ebr163/socialauth/facebook/FacebookClient.java
@@ -1,9 +1,9 @@
 package com.ebr163.socialauth.facebook;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 
 import com.ebr163.socialauth.facebook.model.FacebookProfile;
 import com.ebr163.socialauth.facebook.model.Location;

diff --git a/google/build.gradle b/google/build.gradle
@@ -9,9 +9,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -23,9 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     testCompile 'junit:junit:4.12'
 
     compile "com.google.android.gms:play-services-auth:$GOOGLE_PLAY_SERVICE_VERSION"

diff --git a/google/src/main/java/com/ebr163/socialauth/google/GooglePlusClient.java b/google/src/main/java/com/ebr163/socialauth/google/GooglePlusClient.java
@@ -1,10 +1,10 @@
 package com.ebr163.socialauth.google;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 

diff --git a/instagram/build.gradle b/instagram/build.gradle
@@ -9,9 +9,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -23,10 +20,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     testCompile 'junit:junit:4.12'
+    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
+
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
 }
diff --git a/instagram/src/main/java/com/ebr163/socialauth/instagram/InstagramClient.java b/instagram/src/main/java/com/ebr163/socialauth/instagram/InstagramClient.java
@@ -1,9 +1,9 @@
 package com.ebr163.socialauth.instagram;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
+import android.support.v4.app.Fragment;
 
 import com.ebr163.socialauth.instagram.model.InstagramProfile;
 import com.ebr163.socialauth.instagram.model.InstagramResponse;

diff --git a/instagram/src/main/java/com/ebr163/socialauth/instagram/utils/InstagramUtils.java b/instagram/src/main/java/com/ebr163/socialauth/instagram/utils/InstagramUtils.java
@@ -1,9 +1,9 @@
 package com.ebr163.socialauth.instagram.utils;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
+import android.support.v4.app.Fragment;
 
 import com.ebr163.socialauth.instagram.InstagramAuthActivity;
 import com.ebr163.socialauth.instagram.rest.InstagramConfig;

diff --git a/vk/build.gradle b/vk/build.gradle
@@ -9,9 +9,6 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -23,9 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     testCompile 'junit:junit:4.12'
 
     compile "com.vk:androidsdk:$VK_SDK_VERSION"