Merge pull request #92 from wordpress-mobile/upgrade-to-gradle-7

Upgrade to gradle 7 & Android Gradle Plugin 4.2.2 & Add Buildkite

Author: oguzkocer

.buildkite/pipeline.yml

@@ -0,0 +1,39 @@
+common-params:
+  &docker-container
+  docker#v3.8.0:
+    image: "public.ecr.aws/automattic/android-build-image:v1.1.0"
+    propagate-environment: true
+    environment:
+      # DO NOT MANUALLY SET THESE VALUES!
+      # They are passed from the Buildkite agent to the Docker container
+      - "AWS_ACCESS_KEY"
+      - "AWS_SECRET_KEY"
+
+steps:
+  - label: "Lint & Checkstyle"
+    key: "lint_and_checkstyle"
+    plugins:
+      - *docker-container
+    command: |
+      cp gradle.properties-example gradle.properties
+      ./gradlew lint checkstyle
+
+  - label: "Test"
+    key: "test"
+    plugins:
+      - *docker-container
+    command: |
+      cp gradle.properties-example gradle.properties
+      ./gradlew test
+
+  - label: "Build and upload to S3"
+    depends_on:
+      - "lint_and_checkstyle"
+      - "test"
+    plugins:
+      - *docker-container
+    command: |
+      cp gradle.properties-example gradle.properties
+      ./gradlew \
+          :WordPressUtils:prepareToPublishToS3 $(prepare_to_publish_to_s3_params) \
+          :WordPressUtils:publish

.circleci/config.yml

@@ -1,46 +1,34 @@
-buildscript {
-    ext.kotlinVersion = '1.4.10'
-    ext.kotlin_ktx_version = '1.2.0'
-
-    repositories {
-        google()
-        jcenter()
-        maven { url 'https://a8c-libs.s3.amazonaws.com/android' }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.automattic.android:publish-to-s3:0.4.2'
-    }
+plugins {
+    id "com.android.library"
+    id "org.jetbrains.kotlin.android"
+    id "com.automattic.android.publish-to-s3"
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.automattic.android.publish-library-to-s3'
+ext.kotlin_ktx_version = '1.5.0'
 
 repositories {
     google()
-    jcenter()
+    mavenCentral()
+    maven { url 'https://a8c-libs.s3.amazonaws.com/android' }
 }
 
 dependencies {
     implementation 'org.apache.commons:commons-text:1.1'
-    implementation 'com.android.volley:volley:1.1.1'
+    implementation 'com.android.volley:volley:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'org.greenrobot:eventbus:3.0.0'
 
     implementation "androidx.core:core-ktx:$kotlin_ktx_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$gradle.ext.kotlinVersion"
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.assertj:assertj-core:3.11.1'
     testImplementation "org.robolectric:robolectric:4.4"
     testImplementation 'androidx.test:core:1.0.0'
 
-    lintChecks 'org.wordpress:lint:1.0.1'
+    lintChecks 'org.wordpress:lint:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test:rules:1.1.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
@@ -70,26 +58,22 @@ android {
     }
 }
 
-android.libraryVariants.all { variant ->
-    task("generate${variant.name}Javadoc", type: Javadoc) {
-        description "Generates Javadoc for $variant.name."
-        source = variant.javaCompile.source
+project.afterEvaluate {
+    publishing {
+        publications {
+            UtilsPublication(MavenPublication) {
+                from components.release
 
-        options {
-            links "http://docs.oracle.com/javase/7/docs/api/"
+                groupId "org.wordpress"
+                artifactId "utils"
+                // version is set by 'publish-to-s3' plugin
+            }
         }
-        exclude '**/R.java'
-        doFirst {
-            classpath =
-                    files(variant.javaCompile.classpath.files,
-                            project.android.getBootClasspath())
-        }
-    }
+   }
 }
 
-s3PublishLibrary {
-    groupId "org.wordpress"
-    artifactId "utils"
-    from "release"
+publishToS3Plugin {
+    mavenPublishGroupId "org.wordpress"
+    mavenPublishArtifactId "utils"
 }
 

WordPressUtils/build.gradle

@@ -1,25 +1,10 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.automattic.android:fetchstyle:1.1'
-    }
+plugins {
+    id "com.automattic.android.fetchstyle"
 }
 
-apply plugin: 'com.automattic.android.fetchstyle'
-
 allprojects {
     apply plugin: 'checkstyle'
 
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-    }
-
     if (tasks.findByPath('checkstyle') == null) {
         tasks.create(name: 'checkstyle', type: Checkstyle) {
             source 'src'

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath