Prepare 3.2.1 release (#539)

Shopify · Apr 16, 2018 · 8ee1641 · 8ee1641
1 parent 49406bf
commit 8ee1641
Show file tree

Hide file tree

Showing 20 changed files with 8,282 additions and 7,351 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.2
+    - build-tools-27.0.3
     - extra-android-m2repository
-    - android-24
+    - android-26
     - extra-google-m2repository
     - extra-android-support
   licenses:

diff --git a/MobileBuy/build.gradle b/MobileBuy/build.gradle
@@ -8,6 +8,7 @@ subprojects {
   buildscript {
     System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
     repositories {
+      google()
       jcenter()
       maven { url "https://jitpack.io" }
       maven { url "https://oss.sonatype.org/content/repositories/snapshots" }

diff --git a/MobileBuy/buy3-pay-support/build.gradle b/MobileBuy/buy3-pay-support/build.gradle
@@ -1,7 +1,6 @@
 buildscript {
   dependencies {
     classpath dep.androidPlugin
-    classpath dep.retrolambda
     classpath dep.androidMavenGradlePlugin
     classpath dep.bintrayGradlePlugin
   }
@@ -12,7 +11,6 @@ apply plugin: 'maven'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
   compileSdkVersion androidConfig.compileSdkVersion
@@ -40,63 +38,10 @@ android {
   }
 
   libraryVariants.all { variant ->
-    variant.outputs.each { output ->
+    variant.outputs.all { output ->
       def outputFile = output.outputFile
       if (outputFile != null && outputFile.name.endsWith('.aar')) {
-        def fileName = "${archivesBaseName}-${VERSION_NAME}.aar"
-        output.outputFile = new File(outputFile.parent, fileName)
-      }
-    }
-
-    if (variant.name.equals('release')) {
-
-      task("javadoc", type: Javadoc, dependsOn: assembleRelease) {
-        description "Generate Javadoc"
-        title = "Mobile Buy SDK"
-        source = android.sourceSets.main.java.srcDirs
-
-        def androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(androidJar)
-
-        options {
-          linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference")
-        }
-
-        exclude('**/BuildConfig.java')
-      }
-
-      task("javadocJar", type: Jar, dependsOn: javadoc) {
-        description "Bundles Javadoc into zip"
-        classifier = "javadoc"
-        baseName = 'buy3-pay-support'
-        from tasks["javadoc"]
-      }
-
-      artifacts {
-        archives project.javadocJar
-      }
-
-      task("archiveReleasePackage", type: Zip, dependsOn: [javadocJar]) {
-        baseName = "mobile-buy-sdk-android"
-
-        from("./build/libs") {
-          include javadocJar.getArchiveName()
-        }
-
-        from("./build/docs") {
-          include 'javadoc/**'
-        }
-
-        from("./build/outputs/aar") {
-          include "buy3-pay-support-" + VERSION_NAME + ".aar"
-        }
-
-        from("../..") {
-          include "LICENSE"
-          include "NOTICE"
-        }
-
-        into(baseName + "-" + VERSION_NAME)
+        outputFileName = "${variant.name}-${VERSION_NAME}.aar"
       }
     }
   }
@@ -192,14 +137,14 @@ bintray {
 }
 
 dependencies {
-  compile dep.playServicesWallet
+  implementation dep.playServicesWallet
 
-  androidTestCompile dep.mockitoCore
-  androidTestCompile dep.truth
-  androidTestCompile 'com.android.support.test:runner:0.5'
-  androidTestCompile 'com.android.support.test:rules:0.5'
+  androidTestImplementation dep.mockitoCore
+  androidTestImplementation dep.truth
+  androidTestImplementation 'com.android.support.test:runner:0.5'
+  androidTestImplementation 'com.android.support.test:rules:0.5'
 
-  testCompile dep.mockitoCore
-  testCompile dep.junit
-  testCompile dep.truth
+  testImplementation dep.mockitoCore
+  testImplementation dep.junit
+  testImplementation dep.truth
 }
diff --git a/MobileBuy/buy3/build.gradle b/MobileBuy/buy3/build.gradle
@@ -1,7 +1,6 @@
 buildscript {
   dependencies {
     classpath dep.androidPlugin
-    classpath dep.retrolambda
     classpath dep.androidMavenGradlePlugin
     classpath dep.bintrayGradlePlugin
   }
@@ -12,7 +11,6 @@ apply plugin: 'maven'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
   compileSdkVersion androidConfig.compileSdkVersion
@@ -44,11 +42,10 @@ android {
   }
 
   libraryVariants.all { variant ->
-    variant.outputs.each { output ->
+    variant.outputs.all { output ->
       def outputFile = output.outputFile
       if (outputFile != null && outputFile.name.endsWith('.aar')) {
-        def fileName = "${archivesBaseName}-${VERSION_NAME}.aar"
-        output.outputFile = new File(outputFile.parent, fileName)
+        outputFileName = "${variant.name}-${VERSION_NAME}.aar"
       }
     }
 
@@ -58,55 +55,22 @@ android {
         classifier = 'sources'
       }
 
-      task("javadoc", type: Javadoc, dependsOn: assembleRelease) {
-        description "Generate Javadoc"
-        title = "Mobile Buy SDK"
-        source = android.sourceSets.main.java.srcDirs
-
-        def androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(androidJar)
-
-        options {
-          linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference")
-        }
-
-        exclude('**/BuildConfig.java')
+      task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.sourceFiles
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += configurations.compile
       }
 
-      task("javadocJar", type: Jar, dependsOn: javadoc) {
-        description "Bundles Javadoc into zip"
-        classifier = "javadoc"
-        baseName = 'buy3'
-        from tasks["javadoc"]
+      task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
       }
 
       artifacts {
         archives javadocJar
         archives sourcesJar
       }
-
-      task("archiveReleasePackage", type: Zip, dependsOn: [javadocJar]) {
-        baseName = "mobile-buy-sdk-android"
-
-        from("./build/libs") {
-          include javadocJar.getArchiveName()
-        }
-
-        from("./build/docs") {
-          include 'javadoc/**'
-        }
-
-        from("./build/outputs/aar") {
-          include "buy3-" + VERSION_NAME + ".aar"
-        }
-
-        from("../..") {
-          include "LICENSE"
-          include "NOTICE"
-        }
-
-        into(baseName + "-" + VERSION_NAME)
-      }
     }
   }
 
@@ -120,23 +84,23 @@ android {
 }
 
 dependencies {
-  compile dep.okhttp
-  compile dep.androidSupportAnnotations
-  compile dep.jodaTime
-  compile dep.gson
-  compile dep.timber
-
-  androidTestCompile dep.mockitoCore
-  androidTestCompile dep.mockWebServer
-  androidTestCompile dep.truth
-  androidTestCompile dep.okhttpTestSupport
-  androidTestCompile 'com.android.support.test:runner:0.5'
-  androidTestCompile 'com.android.support.test:rules:0.5'
-
-  testCompile dep.mockitoCore
-  testCompile dep.junit
-  testCompile dep.truth
-  testCompile dep.mockWebServer
+  implementation dep.okhttp
+  implementation dep.androidSupportAnnotations
+  implementation dep.jodaTime
+  implementation dep.gson
+  implementation dep.timber
+
+  androidTestImplementation dep.mockitoCore
+  androidTestImplementation dep.mockWebServer
+  androidTestImplementation dep.truth
+  androidTestImplementation dep.okhttpTestSupport
+  androidTestImplementation 'com.android.support.test:runner:0.5'
+  androidTestImplementation 'com.android.support.test:rules:0.5'
+
+  testImplementation dep.mockitoCore
+  testImplementation dep.junit
+  testImplementation dep.truth
+  testImplementation dep.mockWebServer
 }
 
 /*

diff --git a/MobileBuy/buy3/gradle.properties b/MobileBuy/buy3/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=3.1.2
+VERSION_NAME=3.2.1
 
 POM_ARTIFACT_ID=buy3
 POM_GROUP_ID=com.shopify.mobilebuysdk