Skip to content

Commit

Permalink
Update dependencies and release
Browse files Browse the repository at this point in the history
  • Loading branch information
pmendelski committed May 14, 2022
1 parent 5a9368b commit 6a67ba3
Show file tree
Hide file tree
Showing 11 changed files with 239 additions and 160 deletions.
22 changes: 9 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
name: Build

on:
workflow_dispatch:
push:
paths-ignore:
- 'README.md'
on: [ push ]

jobs:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Parse Changelog Entry
Expand All @@ -24,24 +20,24 @@ jobs:
run: echo ::set-output name=version::$(git describe --abbrev=0 --tags --match 'v[0-9]*\.[0-9]*\.[0-9]*' | cut -c2-)
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 8
uses: actions/setup-java@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
java-version: 8
distribution: 'temurin'
java-version: '8'
- name: Cache Gradle
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build with Gradle
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
run: ./gradlew build jacocoTestReport coveralls --scan --stacktrace
run: ./gradlew build jacocoTestReport coveralls --scan
- name: Publish Reports Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: always()
with:
name: Reports
Expand Down
10 changes: 1 addition & 9 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.2.0] - 2022-05-14
### Changed
- Updated gradle to 7.4.2 with all dependencies

## [0.1.14] - 2021-04-11
### Changed
- Updated dependencies for Gradle v7
Expand Down Expand Up @@ -31,7 +35,8 @@
### Changed
- Fix SCM attributes generated in multi-module projects [#1](https://github.com/coditory/gradle-manifest-plugin/issues/1).

[Unreleased]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.14...HEAD
[Unreleased]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.2.0...HEAD
[0.2.0]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.13...v0.2.0
[0.1.14]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.13...v0.1.14
[0.1.13]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.12...v0.1.13
[0.1.12]: https://github.com/coditory/gradle-manifest-plugin/compare/v0.1.11...v0.1.12
Expand Down
43 changes: 24 additions & 19 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,37 +1,43 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.31"
kotlin("jvm") version "1.6.20"
id("jacoco")
id("com.github.kt3k.coveralls") version "2.12.0"
id("com.gradle.plugin-publish") version "0.14.0"
id("com.gradle.plugin-publish") version "1.0.0-rc-2"
id("java-gradle-plugin")
id("maven-publish")
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
}

repositories {
mavenCentral()
}

ktlint {
version.set("0.41.0")
version.set("0.45.2")
}

dependencies {
implementation(gradleApi())
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("reflect"))
// implementation(kotlin("stdlib-jdk8"))
// implementation(kotlin("reflect"))
implementation("org.eclipse.jgit:org.eclipse.jgit:5.9.0.202009080501-r")

testImplementation("org.assertj:assertj-core:3.19.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.1")
testImplementation("org.assertj:assertj-core:3.22.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
}

group = "com.coditory.gradle"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

tasks.withType<Test> {
useJUnitPlatform()
testLogging {
Expand All @@ -49,33 +55,32 @@ tasks.withType<KotlinCompile>().configureEach {

tasks.jacocoTestReport {
reports {
xml.isEnabled = true
html.isEnabled = true
xml.required.set(true)
html.required.set(true)
}
}

coveralls {
sourceDirs = listOf("src/main/kotlin")
}

// Marking new version (incrementPatch [default], incrementMinor, incrementMajor)
// ./gradlew markNextVersion -Prelease.incrementer=incrementMinor
// Releasing the plugin:
// ./gradlew release && ./gradlew publishPlugins
gradlePlugin {
plugins {
create("manifestPlugin") {
id = "com.coditory.manifest"
implementationClass = "com.coditory.gradle.manifest.ManifestPlugin"
displayName = "Manifest plugin"
description = "Writes project metadata to META-INF/MANIFEST.MF"
}
}
}

pluginBundle {
website = "https://github.com/coditory/gradle-manifest-plugin"
vcsUrl = "https://github.com/coditory/gradle-manifest-plugin"
description = "Writes project metadata to META-INF/MANIFEST.MF"
tags = listOf("project manifest plugin", "manifest")

(plugins) {
"manifestPlugin" {
displayName = "Manifest plugin"
}
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 6a67ba3

Please sign in to comment.