Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@

# These are Windows script files and should use crlf
*.bat text eol=crlf

25 changes: 1 addition & 24 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- pull_request

jobs:
gradle-build-and-test:
build-and-test:
runs-on: ubuntu-latest

steps:
Expand All @@ -23,26 +23,3 @@ jobs:

- name: Test
run: ./gradlew test

ant-build-and-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Install JUnit5 for ANT
run: ./ci/install_ant_junit5.sh

- name: Download Dependencies
run: ant resolve

- name: Build
run: ant build

- name: Test
run: ant test
4 changes: 0 additions & 4 deletions gradle.Jenkinsfile → Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ pipeline {
}

post {
always {
chuckNorris()
}

cleanup {
cleanWs()
}
Expand Down
37 changes: 11 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,26 @@ Simple dependency injection container in Java
+ Operating system \
*Debian testing*
+ [Java](https://www.oracle.com/technetwork/java/javase/overview/index.html) \
*APT package `openjdk-17-jdk`, version 17 SE*
+ [Gradle](https://gradle.org/) or [Apache ANT](http://ant.apache.org/) \
*SDK-Man `gradle`, version 8.10* \
*APT package `ant`, version 1.10.+*
*APT package `openjdk-21-jdk`, version 21 SE*
+ [Gradle](https://gradle.org/) \
*SDK-Man `gradle`, version 8.10*

## Dependencies

> dependencies are automatically downloaded during build process

*none*

## Test dependencies

> dependencies are automatically downloaded during build process

+ JUnit 5.+
+ AssertJ 3.+

-----

## How to build with Gradle?
## How to build?

YADIC can be built with **Gradle**. All dependencies are downloaded during build, so
make sure your Internet connection is working!
Expand All @@ -46,26 +51,6 @@ Possible Gradle tasks are:
+ `gradle rebuild` - remove additional build files & resolve dependencies & compile source files &
create jar & run all tests

## How to build with ANT?

YADIC can be built with **Apache ANT** using **Apache Ivy** to resolve all dependencies.
Ivy itself and all dependencies are downloaded during build, so make sure your Internet
connection is working!

Possible ANT targets are:

+ `ant`, `ant build` - resolve dependencies & compile source files & create jar & run all tests
+ `ant resolve` - resolve dependencies
+ `ant jar` - compile source files & create jar
+ `ant test` - run all tests
+ `ant docs` - generate Javadoc
+ `ant clean` - remove additional build files
+ `ant rebuild` - remove additional build files & resolve dependencies & compile source files &
create jar & run all tests

## How to include it?

Simply add the *jar* file to your classpath from the directory:

+ `build/libs` for Gradle builds
+ `antBuild/dist` for ANT builds
Simply add the *jar* file to your module path from the `build/libs` directory:
115 changes: 0 additions & 115 deletions ant.Jenkinsfile

This file was deleted.

3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ ext {
specVersion = "${majorVersion}.${minorVersion}"
jarVersion = "${majorVersion}.${minorVersion}.${dateVersion}"
vendor = 'Rafał Kaleta'
mainPackage = 'yadic'
mainPackage = 'com.github.refhumbold.yadic'
}

version = project.jarVersion
archivesBaseName = project.mainPackage

repositories {
mavenCentral()
Expand Down
120 changes: 0 additions & 120 deletions build.xml

This file was deleted.

17 changes: 0 additions & 17 deletions ci/install_ant_junit5.sh

This file was deleted.

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,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading