Merge branch 'improvement/sc-log' into release

# Conflicts: # build.gradle # dfu/build.gradle # gradle/gradle-bintray-push.gradle # gradle/wrapper/gradle-wrapper.properties
NordicSemiconductor · Jul 27, 2020 · 7acc824 · 7acc824
2 parents fe3a90a + c2bed38
commit 7acc824
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         // 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
@@ -7,6 +7,7 @@ android {
         minSdkVersion 18
         targetSdkVersion 29
         versionCode 24
+        versionName VERSION_NAME
     }
 
     buildTypes {
@@ -18,7 +19,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.5.0-alpha01'
+    implementation 'androidx.core:core:1.3.0-alpha02'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'

diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java b/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java
@@ -371,6 +371,7 @@ public boolean initialize(@NonNull final Intent intent, @NonNull final Bluetooth
 					if (!serviceChangedIndicationsEnabled)
 						enableCCCD(serviceChangedCharacteristic, INDICATIONS);
 
+					logi("Service Changed indications enabled");
 					mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION, "Service Changed indications enabled");
 				}
 			}

diff --git a/gradle/gradle-bintray-push.gradle b/gradle/gradle-bintray-push.gradle
@@ -4,36 +4,11 @@ apply plugin: 'com.jfrog.bintray'
 version = VERSION_NAME
 group   = GROUP
 
-task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    android.libraryVariants.all { variant ->
-        if (variant.name == 'release') {
-            owner.classpath += variant.javaCompileProvider.get().classpath
-        }
-    }
-    exclude '**/R.html', '**/R.*.html', '**/index.html'
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set('javadoc')
-    from androidJavadocs.destinationDir
-}
-
-task androidSourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate { project ->
     publishing {
         publications {
             release(MavenPublication) {
                 from components.release
-
-                artifact androidSourcesJar
-                artifact androidJavadocsJar
-
                 groupId = GROUP
                 artifactId = POM_ARTIFACT_ID
                 version = VERSION_NAME
@@ -69,13 +44,45 @@ afterEvaluate { project ->
         }
     }
 
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.sourceFiles
+
+        title = POM_DESCRIPTION
+
+        options.links("https://docs.oracle.com/javase/8/docs/api/")
+        options.linksOffline("https://d.android.com/reference","${android.sdkDirectory}/docs/reference")
+
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += configurations.compile
+
+        // We're excluding these generated files
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
+    }
+
+    task androidJavadocsJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.source
+    }
+
     if (JavaVersion.current().isJava8Compatible()) {
         allprojects {
             tasks.withType(Javadoc) {
                 options.addStringOption('Xdoclint:none', '-quiet')
             }
         }
     }
+
+    artifacts {
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
 }
 
 // Bintray

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 24 14:20:07 CEST 2020
+#Tue Mar 10 10:35:51 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip