Merge pull request #25 from bleacherreport/feature/git-actions-enable

Update Snapshot CI

Author: mdelgado89

.github/workflows/release-ci.yml

@@ -0,0 +1,41 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+env:
+  JAVA_TOOL_OPTIONS: -Xmx5120m
+  TERM: dumb
+
+jobs:
+  build:
+    name: Build and Publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Save/Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Build Velocidapter
+        run: ./gradlew build
+
+      - name: Publish to GitHub Packages
+        run: ./gradlew publish -PmavenCentralRepositoryUsername=${{ github.actor }} -PmavenCentralRepositoryPassword=${{ secrets.GITHUB_TOKEN }} -PVERSION_NAME=${GITHUB_REF##*v}

.github/workflows/snapshot-ci.yml

@@ -1,20 +1,13 @@
 name: Snapshots
 
 on:
-  pull_request:
-    branches:
-      - master
   push:
     branches:
       - master
 
 env:
   JAVA_TOOL_OPTIONS: -Xmx5120m
   TERM: dumb
-  releaseStorePassword: ${{ secrets.RELEASESTOREPASSWORD }}
-  releaseKeyPassword: ${{secrets.KEY_PASSWORD}}
-  releaseKeyAlias: ${{secrets.KEY_ALIAS}}
-  FIREBASE_TOKEN: ${{secrets.FIREBASE_TOKEN}}
 
 jobs:
   update_draft_release:
@@ -29,11 +22,10 @@ jobs:
   build:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
-    name: Build Debug
+    name: Build and Publish
     runs-on: ubuntu-latest
 
     steps:
-
       - uses: actions/checkout@v2
 
       - name: Copy CI gradle.properties
@@ -54,13 +46,8 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle-
 
-      - name: Upload Annotations
+      - name: Build Velocidapter
         run: ./gradlew build
 
-    # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
-    # the publishing section of your build.gradle
-    - name: Publish to GitHub Packages
-      run: ./gradlew publish
-      env:
-        USERNAME: ${{ github.actor }}
-        TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish to GitHub Packages
+        run: ./gradlew publish -PmavenCentralRepositoryUsername=${{ github.actor }} -PmavenCentralRepositoryPassword=${{ secrets.GITHUB_TOKEN }}

bintray/properties.gradle

@@ -1,21 +1,22 @@
-apply from: 'bintray/properties.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.4.32'
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
     }
 }
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
@@ -27,22 +28,4 @@ task clean(type: Delete) {
         delete buildDir
         rootProject.clean { dependsOn tasks.matching { it.name == 'clean' } }
     }
-}
-
-// Bintray upload steps
-def annotationsInstall = 'velocidapter-annotations:install'
-def annotationsUpload = 'velocidapter-annotations:bintrayUpload'
-def mainInstall = 'velocidapter:install'
-def mainUpload = 'velocidapter:bintrayUpload'
-def androidInstall = 'velocidapter-android:install'
-def androidUpload = 'velocidapter-android:bintrayUpload'
-
-task uploadAnnotations(dependsOn: [clean, annotationsInstall, annotationsUpload])
-task(annotationsInstall).mustRunAfter(clean)
-task(annotationsUpload).mustRunAfter(annotationsInstall)
-
-task uploadMain(dependsOn: [clean, mainInstall, mainUpload, androidInstall, androidUpload])
-task(mainInstall).mustRunAfter(clean)
-task(mainUpload).mustRunAfter(mainInstall)
-task(androidInstall).mustRunAfter(mainUpload)
-task(androidUpload).mustRunAfter(androidInstall)
+}

bintray/upload.gradle

@@ -14,3 +14,24 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+RELEASE_REPOSITORY_URL=https://maven.pkg.github.com/bleacherreport/Velocidapter
+SNAPSHOT_REPOSITORY_URL=https://maven.pkg.github.com/bleacherreport/Velocidapter
+
+VERSION_NAME=1.4.2-SNAPSHOT
+GROUP=com.bleacherreport.velocidapter
+
+POM_NAME=Velocidapter
+POM_DESCRIPTION=Velocidapter
+POM_INCEPTION_YEAR=2018
+
+POM_URL=https://github.com/bleacherreport/Velocidapter
+POM_SCM_URL=https://github.com/bleacherreport/Velocidapter
+POM_SCM_CONNECTION=scm:git@github.com:bleacherreport/Velocidapter.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:bleacherreport/Velocidapter.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=Bleacher Report
+POM_DEVELOPER_NAME=Bleacher Report
+RELEASE_SIGNING_ENABLED=false
+systemProp.org.gradle.internal.publish.checksums.insecure=true

build.gradle

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

gradle.properties

@@ -1,8 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-apply from: '../bintray/upload.gradle'
 
 android {
     compileSdkVersion 28
@@ -26,10 +23,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
 
-    api 'com.bleacherreport:velocidapter-annotations:1.4.1'
+    api project(':velocidapter-annotations')
+//    api 'com.bleacherreport.velocidapter:velocidapter-annotations:1.4.1-SNAPSHOT'
 }
 
-repositories {
-    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
-    mavenCentral()
-}
+apply plugin: "com.vanniktech.maven.publish"

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-artifact=velocidapter-android
+POM_ARTIFACT_ID=velocidapter-android
 sourceDirs=android.sourceSets.main.java.srcDirs
-packageType=aar
-android.enableJetifier=false
+POM_PACKAGING=aar
+android.enableJetifier=false

velocidapter-android/build.gradle

@@ -1,16 +1,11 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-apply from: '../bintray/upload.gradle'
+apply plugin: 'org.jetbrains.dokka'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-repositories {
-    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
-    mavenCentral()
-}
+apply plugin: "com.vanniktech.maven.publish"