diff --git a/.github/workflows/kelpie.yaml b/.github/workflows/kelpie.yaml index 87e0e7d..3f4f086 100644 --- a/.github/workflows/kelpie.yaml +++ b/.github/workflows/kelpie.yaml @@ -1,16 +1,19 @@ name: Kelpie -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: runs-on: ubuntu-latest name: Build + strategy: + matrix: + java_version: [8, 11, 17, 21] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache repository - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} @@ -18,9 +21,30 @@ jobs: ${{ runner.os }}-gradle- - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.8 + java-version: ${{ matrix.java_version }} + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build Kelpie run: ./gradlew build + + - name: Install distribution of Kelpie + run: ./gradlew installDist + + - name: Checkout Kelpie-Test + uses: actions/checkout@v4 + with: + repository: scalar-labs/kelpie-test + path: kelpie-test + + - name: Build Kelpie-Test:print-modules + working-directory: kelpie-test/print-modules + run: gradle shadowJar + + - name: Execute Kelpie-Test:print-modules + working-directory: kelpie-test + run: ${{ github.workspace }}/build/install/kelpie/bin/kelpie --config print-modules/config.toml diff --git a/build.gradle b/build.gradle index 28a758a..0188b73 100644 --- a/build.gradle +++ b/build.gradle @@ -23,15 +23,11 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.2.4' } -task sourcesJar(type: Jar) { - classifier = 'sources' - from sourceSets.main.allSource +java { + withJavadocJar() + withSourcesJar() } -task javadocJar(type: Jar) { - classifier = 'javadoc' - from javadoc -} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9492014..81aa1c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists