Skip to content

Commit

Permalink
Support Gradle 8.0 (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Jun 17, 2023
1 parent 660937f commit b40a758
Show file tree
Hide file tree
Showing 17 changed files with 353 additions and 250 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* text=auto eol=lf

*.bat text eol=crlf
*.jar binary
27 changes: 27 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Main

on:
pull_request:
push:
branches:
- master
workflow_dispatch:

jobs:
build:
strategy:
matrix:
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17
- uses: gradle/wrapper-validation-action@v1
- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Execute Gradle build
run: ./gradlew build
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ If you're still using the deprecated `osgi` Gradle plugin in Gradle 6, you can u

## How to use

Just replace the original `apply plugin: 'osgi'` with `apply plugin: 'com.github.blindpirate.osgi'`.
[![Download](https://img.shields.io/gradle-plugin-portal/v/com.github.blindpirate.osgi)](https://plugins.gradle.org/plugin/com.github.blindpirate.osgi)

See [it on Gradle plugin portal](https://plugins.gradle.org/plugin/com.github.blindpirate.osgi).
Just replace the original `apply plugin: 'osgi'` with `apply plugin: 'com.github.blindpirate.osgi'`.
33 changes: 21 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library'
id 'groovy'
id "com.gradle.plugin-publish" version "0.12.0"
id "com.gradle.plugin-publish" version "1.2.0"
}

repositories {
Expand All @@ -10,33 +10,42 @@ repositories {

group 'com.github.blindpirate'
version '0.0.6'
sourceCompatibility = '1.8'
targetCompatibility = '1.8'

java {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}

dependencies {
api gradleApi()
api localGroovy()
api 'biz.aQute.bnd:biz.aQute.bndlib:5.2.0'
api 'biz.aQute.bnd:biz.aQute.bndlib:6.4.1'

testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
testImplementation 'net.bytebuddy:byte-buddy:1.10.6'
testImplementation(platform('org.junit:junit-bom:5.8.0'))
testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
testImplementation 'net.bytebuddy:byte-buddy:1.14.5'
testImplementation(platform('org.junit:junit-bom:5.9.3'))
testImplementation('org.junit.vintage:junit-vintage-engine')
}

pluginBundle {
gradlePlugin {
website = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
vcsUrl = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'

plugins {
osgiPlugin {
website = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
vcsUrl = 'https://github.com/blindpirate/gradle-legacy-osgi-plugin'
description = 'A legacy osgi plugin in Gradle 5'
tags = ['legacy', 'osgi']
id = 'com.github.blindpirate.osgi'
implementationClass = "com.github.blindpirate.osgi.plugins.osgi.OsgiPlugin"
displayName = 'A legacy osgi plugin in Gradle 5'
description = 'A legacy osgi plugin in Gradle 5'
tags.set(['legacy', 'osgi'])
}
}
}

tasks.named('publishPlugins') {
notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
}

publishPlugins.dependsOn 'check'

test {
Expand Down
4 changes: 4 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b40a758

Please sign in to comment.