Merge pull request #836 from Microsoft/feature/update-to-as32

Use Android Studio 3.2

.gitignore

@@ -13,6 +13,7 @@ output.json
 bin/
 gen/
 out/
+jacoco.exec
 
 # Gradle files
 .gradle/

build.gradle

@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.google.gms:google-services:4.0.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 02 11:29:45 PDT 2018
+#Mon Oct 08 07:49:51 MSK 2018
 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

sdk/appcenter/src/main/java/com/microsoft/appcenter/channel/OneCollectorChannelListener.java

@@ -79,6 +79,8 @@ public class OneCollectorChannelListener extends AbstractChannelListener {
      *
      * @param context context.
      * @param channel channel.
+     * @param logSerializer log serializer.
+     * @param installId installId.
      */
     public OneCollectorChannelListener(@NonNull Context context, @NonNull Channel channel, @NonNull LogSerializer logSerializer, @NonNull UUID installId) {
         mChannel = channel;

sdk/appcenter/src/main/java/com/microsoft/appcenter/ingestion/models/one/PartAUtils.java

@@ -48,6 +48,7 @@ public static void setName(CommonSchemaLog log, String name) throws IllegalArgum
      *
      * @param src  source log.
      * @param dest destination common schema log.
+     * @param transmissionTarget transmission target to use.
      */
     public static void addPartAFromLog(Log src, CommonSchemaLog dest, String transmissionTarget) {
 

sdk/appcenter/src/main/java/com/microsoft/appcenter/utils/storage/StorageHelper.java

@@ -586,6 +586,7 @@ public static DatabaseStorage getDatabaseStorage(@NonNull String database,
          * Set maximum SQLite database size.
          *
          * @param maxStorageSizeInBytes Maximum SQLite database size.
+         * @return true if database size was set, otherwise false.
          */
         public boolean setMaxStorageSize(long maxStorageSizeInBytes) {
             return mDatabaseManager.setMaxSize(maxStorageSizeInBytes);

sdk/build.gradle

@@ -8,6 +8,9 @@ allprojects {
     jacoco {
         toolVersion '0.7.9'
     }
+    tasks.withType(Test) {
+        jacoco.includeNoLocationClasses = true
+    }
 
     //noinspection GroovyAssignabilityCheck
     group rootProject.ext.groupId
@@ -75,35 +78,27 @@ subprojects {
 
         androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4'
         androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
-        androidTestImplementation 'com.android.support.test:runner:1.0.1'
-        androidTestImplementation 'com.android.support.test:rules:1.0.1'
+        androidTestImplementation 'com.android.support.test:runner:1.0.2'
+        androidTestImplementation 'com.android.support.test:rules:1.0.2'
         androidTestImplementation project(':test')
     }
 
-    // Android Studio 2.2.0 broke a lot of scripting, could not find another way of doing this rename trick
-    def createDebugCoverageReportExecutionDataFile = file("${buildDir}/outputs/code-coverage/connected/coverage.ec")
-
-    task renameCreateDebugCoverageReportExecutionDataFile(dependsOn: 'createDebugCoverageReport') {
-        doLast {
-            def file = file(createDebugCoverageReportExecutionDataFile.getParentFile()).listFiles().first()
-            file.renameTo(createDebugCoverageReportExecutionDataFile)
-        }
-    }
-
-    task coverageReport(type: JacocoReport, dependsOn: ['renameCreateDebugCoverageReportExecutionDataFile', 'testDebugUnitTest']) {
+    task coverageReport(type: JacocoReport, dependsOn: ['createDebugCoverageReport', 'testDebugUnitTest']) {
         reports {
-            xml.enabled = false
+            xml.enabled = true
             html.enabled = true
         }
 
-        def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*']
-        def debugTree = fileTree(dir: "${buildDir}/intermediates/classes/debug", excludes: fileFilter)
-        def mainSrc = "${project.projectDir}/src/main/java"
-
-        sourceDirectories = files([mainSrc])
-        classDirectories = files([debugTree])
-        executionData = files(["${buildDir}/jacoco/testDebugUnitTest.exec",
-                               createDebugCoverageReportExecutionDataFile])
+        def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
+        sourceDirectories = files(["$projectDir/src/main/java"])
+        classDirectories = files([
+                fileTree(dir: "$buildDir/intermediates/classes/debug", excludes: fileFilter),
+                fileTree(dir: "$buildDir/intermediates/javac/debug/compileDebugJavaWithJavac/classes", excludes: fileFilter)
+        ])
+        executionData = fileTree(dir: buildDir, includes: [
+                'jacoco/testDebugUnitTest.exec',
+                'outputs/code-coverage/connected/*coverage.ec'
+        ])
     }
 
     task sourcesJar(type: Jar) {
@@ -120,6 +115,11 @@ subprojects {
             configurations.api.dependencies.withType(ProjectDependency).dependencyProject.buildDir.each { dir -> classpath += files("${dir}/intermediates/classes/release") }
             //noinspection GroovyAssignabilityCheck
             classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+            android.libraryVariants.all { variant ->
+                if (variant.name == 'release') {
+                    owner.classpath += variant.javaCompile.classpath
+                }
+            }
             javadoc.dependsOn project.assembleRelease
         }
     }