Merge pull request #297 from openxc/next

Update to v7.0.4
openxc · Feb 5, 2019 · 6264ec8 · 6264ec8
2 parents e39ce69 + 2b52347
commit 6264ec8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,12 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-27.0.3
-  - android-27
+  - build-tools-28.0.3
+  - android-28
   - extra-android-support
   - extra-android-m2repository
+before_install:
+  - yes | sdkmanager "platforms;android-28"
 script:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew build test || ./gradlew testDebug'
 deploy:

diff --git a/build.gradle b/build.gradle
@@ -8,11 +8,11 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
-        classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.2.5'
+        classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.5.0'
     }
 }
 
@@ -25,14 +25,14 @@ allprojects {
 
 
 ext {
-    compileSdkVersion = 27
-    buildToolsVersion = "27.0.3"
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.3"
     minSdkVersion = 18
-    targetSdkVersion = 27
+    targetSdkVersion = 28
 
     versionMajor = 7
     versionMinor = 0
-    versionPatch = 3
+    versionPatch = 4
 
     versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch
     versionName = "${versionMajor}.${versionMinor}.${versionPatch}"

diff --git a/enabler/build.gradle b/enabler/build.gradle
@@ -78,14 +78,14 @@ android {
 
 dependencies {
     implementation project(":library")
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.bugsnag:bugsnag-android:4.3.2'
     implementation 'net.hockeyapp.android:HockeySDK:5.1.0'
 
 
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    androidTestImplementation 'org.mockito:mockito-core:2.17.0'
+    androidTestImplementation 'org.mockito:mockito-core:2.23.0'
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
 }
diff --git a/enabler/src/main/AndroidManifest.xml b/enabler/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="replace"/>
   <uses-feature android:name="android.hardware.usb.host" android:required="true"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
   <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name"
       android:theme="@android:style/Theme.Holo">
@@ -58,6 +59,8 @@
           </intent-filter>
       </receiver>
       <meta-data android:name="com.bugsnag.token" android:value="@string/bugsnag_token"/>
+      <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
   </application>
 
 </manifest>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Jan 16 13:29:14 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -22,15 +22,15 @@ android {
 apply plugin: 'com.github.dcendents.android-maven'
 
 dependencies {
-    api 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.google.guava:guava:24.1-android'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.google.guava:guava:24.1-android'
     implementation 'com.google.protobuf:protobuf-java:3.5.1'
     implementation 'commons-io:commons-io:2.6'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
-    testImplementation 'org.mockito:mockito-core:2.17.0'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
     testImplementation 'org.robolectric:robolectric:3.8'
     testImplementation 'org.robolectric:shadows-httpclient:3.8'
 }