Fix for IllegalAccessError

close #55
isuPatches · Jul 4, 2017 · 24e7971 · 24e7971
1 parent 799d1b1
commit 24e7971
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
 
 ext {
     GROUP = "com.isupatches"
-    VERSION_NAME = "1.0.9"
+    VERSION_NAME = "1.0.10"
 
     BINTRAY_REPO = "Maven"
     BINTRAY_NAME = "wisefy"

diff --git a/wisefy/build.gradle b/wisefy/build.gradle
@@ -32,7 +32,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 8
+        versionCode 9
         versionName version
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
@@ -54,12 +54,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
 
     androidTestCompile 'com.android.support:support-annotations:25.3.1'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'org.mockito:mockito-android:2.8.47'
     androidTestCompile 'com.android.support.test:runner:0.5'
+    // For issue #55 / IllegalAccessError conflict test
+    androidTestCompile 'com.google.android.gms:play-services-gcm:8.3.0'
 
     testCompile 'org.mockito:mockito-core:2.7.19'
     testCompile 'junit:junit:4.12'

diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/WiseFyTest.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/WiseFyTest.java
@@ -10,6 +10,7 @@
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.support.test.rule.ActivityTestRule;
+import com.google.android.gms.iid.InstanceID;
 import com.isupatches.wisefy.WiseFy;
 import com.isupatches.wisefy.constants.WiseFyCodes;
 import com.isupatches.wisefy.test.base.BaseTestClass;
@@ -398,6 +399,12 @@ public void enableWiFi_success() {
         assertEquals(true, result);
     }
 
+    @Test
+    public void olderGcm_IllegalAccessError_notThrown() {
+        InstanceID instanceID = InstanceID.getInstance(mActivityTestRule.getActivity());
+        assertNotNull(instanceID);
+    }
+
     @Test
     public void getCurrentNetwork_failure_nullWifiManager() {
         setManagersToNull();

diff --git a/wisefy/src/main/res/values/colors.xml b/wisefy/src/main/res/values/colors.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
 </resources>
diff --git a/wisefy/src/main/res/values/strings.xml b/wisefy/src/main/res/values/strings.xml
@@ -1,2 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 </resources>
diff --git a/wisefy/src/main/res/values/styles.xml b/wisefy/src/main/res/values/styles.xml