Version 1.7.0

NordicSemiconductor · Jul 3, 2018 · 0b907aa · 0b907aa
1 parent 3cffd16
commit 0b907aa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 The compat library may be found on jcenter and Maven Central repository. Add it to your project by adding the following dependency:
 
 ```Groovy
-compile 'no.nordicsemi.android:dfu:1.6.1'
+compile 'no.nordicsemi.android:dfu:1.7.0'
 ```
 
 If you use proguard, add the following line to your proguard rules:

diff --git a/build.gradle b/build.gradle
@@ -6,13 +6,11 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        /*
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
-        // The following dependency has been replaced with newer version according to https://github.com/dcendents/android-maven-plugin
-        // classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        */
+        classpath 'com.android.tools.build:gradle:3.1.3'
+
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/dfu/build.gradle b/dfu/build.gradle
@@ -8,14 +8,14 @@ apply plugin: 'com.android.library'
  *
  * A newer then described version of maven plugin dependency is required (see project's gradle.build).
  */
-
-/*apply plugin: 'com.github.dcendents.android-maven'
+/*
+apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 ext {
     PUBLISH_GROUP_ID = 'no.nordicsemi.android'
     PUBLISH_ARTIFACT_ID = 'dfu'
-    PUBLISH_VERSION = '1.6.1'
+    PUBLISH_VERSION = '1.7.0'
 
     bintrayRepo = 'android'
     bintrayName = 'dfu-library'
@@ -37,16 +37,16 @@ ext {
     licenseName = 'The BSD 3-Clause License'
     licenseUrl = 'http://opensource.org/licenses/BSD-3-Clause'
     allLicenses = ["BSD 3-Clause"]
-}*/
-
+}
+*/
 android {
     compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 27
-        versionCode 19
-        versionName "1.6.1"
+        versionCode 20
+        versionName "1.7.0"
     }
 
     buildTypes {
@@ -59,7 +59,7 @@ android {
 
 dependencies {
     implementation 'com.android.support:support-core-utils:27.1.1'
-    implementation 'com.google.code.gson:gson:2.8.0'
+    implementation 'com.google.code.gson:gson:2.8.2'
 }
 /*
 
@@ -112,4 +112,5 @@ if (JavaVersion.current().isJava8Compatible()) {
             options.addStringOption('Xdoclint:none', '-quiet')
         }
     }
-}*/
+}
+*/
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 06 17:51:25 CEST 2017
+#Tue Jul 03 15:08:37 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip