Adjust scope for withContext, bump some versions, remove potential ma…

…nifest conflicts

close #41

.travis.yml

@@ -6,7 +6,7 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
     - android-22
     - android-25
     - sys-img-armeabi-v7a-android-22

build.gradle

@@ -46,7 +46,7 @@ subprojects {
 
 ext {
     GROUP = "com.isupatches"
-    VERSION_NAME = "1.0.7"
+    VERSION_NAME = "1.0.8"
 
     BINTRAY_REPO = "Maven"
     BINTRAY_NAME = "wisefy"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Mar 25 21:27:42 CDT 2017
+#Sat Jul 01 22:48:36 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

wisefy/build.gradle

@@ -27,12 +27,12 @@ android {
     }
 
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 6
+        versionCode 7
         versionName version
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
@@ -41,23 +41,25 @@ android {
         debug {
             testCoverageEnabled true
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            testProguardFile file("proguard-test-rules.txt")
         }
 
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
 
-    androidTestCompile 'com.android.support:support-annotations:25.3.0'
+    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.6.9'
+    androidTestCompile 'org.mockito:mockito-android:2.8.47'
+    androidTestCompile 'com.android.support.test:runner:0.5'
 
     testCompile 'org.mockito:mockito-core:2.7.19'
     testCompile 'junit:junit:4.12'

wisefy/src/main/AndroidManifest.xml

@@ -8,12 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+    <application android:allowBackup="true">
 
         <activity android:name=".base.TestActivity" android:exported="false"/>
 

wisefy/src/main/java/com/isupatches/wisefy/WiseFy.java

@@ -82,7 +82,7 @@ public static class withContext implements Logging, GetSmarts {
          * @param context - The activity or application context to get a WifiConfiguration and
          * ConnectivityManager instance
          */
-        withContext(Context context) {
+        public withContext(Context context) {
             this.context = context;
         }