Skip to content

Commit

Permalink
Merge pull request #2 from halcyonmobile/update-publish-plugin
Browse files Browse the repository at this point in the history
Update publish plugin
  • Loading branch information
fknives committed Jul 23, 2021
2 parents 33d79e2 + 5217487 commit 70fa427
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 21 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: gradle
directory: "/"
target-branch: "develop"
schedule:
interval: "weekly"
day: "monday"
time: "12:00"
open-pull-requests-limit: 15
28 changes: 28 additions & 0 deletions .github/workflows/pull-request-jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Verify Pull request is publishable

on:
pull_request:
branches:
- develop

env:
GITHUB_USERNAME: "halcyonmobile"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
run-tests:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- name: Run Android Unit Tests
run: ./gradlew core:test
- name: Run Core Unit Tests
run: ./gradlew core:test
26 changes: 26 additions & 0 deletions .github/workflows/release-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Library Package Publishing

on:
release:
types:
- created

jobs:
publish-library:
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- name: Assemble project
env:
GITHUB_USERNAME: "halcyonmobile"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew publish
9 changes: 8 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ buildscript {
repositories {
google()
jcenter()
maven {
url "https://maven.pkg.github.com/halcyonmobile/halcyon-custom-gradle-publish-plugin"
credentials {
username = System.getenv("GITHUB_USERNAME")
password = System.getenv("GITHUB_TOKEN")
}
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
Expand All @@ -14,7 +21,7 @@ buildscript {

classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.3"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.halcyonmobile.publish.artifactory-bintray:java-and-aar:0.1.0.3'
classpath 'com.halcyonmobile.publish.custom:java-and-aar:2.0.1'
}
}

Expand Down
10 changes: 3 additions & 7 deletions deploy.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// RELEASING
// # 0: update the libraryVersion
// # 1: open terminal and run the following commands
// # 2 artifactory: ./gradlew publishToArtifactory
// # 2 bintray: ./gradlew publishToBintray
// # 3 bintray: make sure you add the published library to jcenter on the site
// ./gradlew howToPublish

ext.libraryGroupId = 'oauth-setup'
ext.libraryVersion = '1.0.0'
ext.bintray_source_url = "https://github.com/halcyonmobile/retrofit-oauth2-helper"
ext.libraryVersion = '1.0.1'
ext.githubPackagePath = 'halcyonmobile/retrofit-oauth2-helper'
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jun 24 17:23:01 EEST 2019
#Fri Jul 23 21:19:08 EEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion oauth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ dependencies {
}

project.ext.set("libraryArtifactId", "oauth-setup")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthadaptergenerator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ compileTestKotlin {
}

project.ext.set("libraryArtifactId", "oauth-adapter-generator")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthdependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ dependencies {
}

project.ext.set("libraryArtifactId", "oauth-setup-dependencies")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthgson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ compileTestKotlin {
}

project.ext.set("libraryArtifactId", "oauth-setup-gson")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthmoshi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ compileTestKotlin {
}

project.ext.set("libraryArtifactId", "oauth-setup-moshi")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthmoshikoin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ compileTestKotlin {
}

project.ext.set("libraryArtifactId", "oauth-setup-moshi-koin")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthparsing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ compileTestKotlin {
}

project.ext.set("libraryArtifactId", "oauth-setup-parsing")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.jar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.jar-library'
2 changes: 1 addition & 1 deletion oauthsecurestorage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ repositories {
}

project.ext.set("libraryArtifactId", "oauth-setup-secure-storage")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.aar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.aar-library'
2 changes: 1 addition & 1 deletion oauthsecurestoragecompat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ repositories {
}

project.ext.set("libraryArtifactId", "oauth-setup-secure-storage-compat")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.aar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.aar-library'
2 changes: 1 addition & 1 deletion oauthstorage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ repositories {
}

project.ext.set("libraryArtifactId", "oauth-setup-storage")
apply plugin: 'com.halcyonmobile.plugin.publish.artifactory.aar-library'
apply plugin: 'com.halcyonmobile.plugin.publish.custom.aar-library'

0 comments on commit 70fa427

Please sign in to comment.