Skip to content

Commit 0a00c0b

Browse files
author
Mark Whitaker
authored
Upgrade Gradle, remove CircleCI, add GitHub Actions workflows (#46)
* Upgrade Gradle, remove CircleCI, add GitHub Actions workflows * Update README.md
1 parent a07c144 commit 0a00c0b

9 files changed

Lines changed: 254 additions & 183 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Build and test
2+
on:
3+
push:
4+
branches: [main]
5+
pull_request:
6+
types: [opened, reopened, synchronize]
7+
8+
jobs:
9+
build-and-test:
10+
name: Build and test
11+
uses: markwhitaker/shared-workflows/.github/workflows/gradle-build-and-test.yml@main
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Publish to GitHub Packages
2+
on:
3+
release:
4+
types: [published]
5+
6+
jobs:
7+
publish-to-nuget:
8+
name: Publish release to GitHub Packages
9+
uses: markwhitaker/shared-workflows/.github/workflows/gradle-publish-to-github-packages.yml@main
10+
secrets: inherit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![icon](artwork/RegexToolbox-icon-100.png)
22

3-
# RegexToolbox.Java [![CircleCI](https://circleci.com/gh/markwhitaker/RegexToolbox.Java.svg?style=shield)](https://circleci.com/gh/markwhitaker/RegexToolbox.Java) [![Download from JitPack](https://jitpack.io/v/markwhitaker/RegexToolbox.Java.svg)](https://jitpack.io/#markwhitaker/RegexToolbox.Java)
3+
# RegexToolbox.Java [![Build and test](https://github.com/markwhitaker/RegexToolbox.Java/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/markwhitaker/RegexToolbox.Java/actions/workflows/build-and-test.yml) [![Download from JitPack](https://jitpack.io/v/markwhitaker/RegexToolbox.Java.svg)](https://jitpack.io/#markwhitaker/RegexToolbox.Java)
44

55
Regular expression tools for Java developers.
66

build.gradle

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,49 @@ buildscript {
44

55
plugins {
66
id 'java-library'
7-
id 'com.palantir.git-version' version '0.15.0'
7+
id 'maven-publish'
88
}
99

1010
repositories {
1111
mavenCentral()
1212
}
1313

1414
group 'uk.co.mainwave.regextoolbox'
15-
version gitVersion()
15+
version getVersionFromGit()
1616

17-
sourceCompatibility = 1.8
17+
sourceCompatibility = JavaVersion.VERSION_1_8
1818

1919
dependencies {
2020
testImplementation "junit:junit:$junit_version"
2121
}
22+
23+
publishing {
24+
repositories {
25+
maven {
26+
name = "GitHubPackages"
27+
url = uri("https://maven.pkg.github.com/markwhitaker/mimetypes.java")
28+
credentials {
29+
username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
30+
password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
31+
}
32+
}
33+
}
34+
publications {
35+
gpr(MavenPublication) {
36+
from(components.java)
37+
}
38+
}
39+
}
40+
41+
def getVersionFromGit() {
42+
try {
43+
def stdout = new ByteArrayOutputStream()
44+
exec {
45+
commandLine "git", "describe", "--always", "--dirty"
46+
standardOutput = stdout
47+
}
48+
return stdout.toString().trim()
49+
} catch (ignored) {
50+
return "1.0.0"
51+
}
52+
}

gradle/wrapper/gradle-wrapper.jar

4.24 KB
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Aug 17 14:34:44 BST 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)