diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7773296..2a38c9e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -5,9 +5,9 @@ name: Build and test on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/changelog-draft.yml b/.github/workflows/changelog-draft.yml index 868bf47..b400e15 100644 --- a/.github/workflows/changelog-draft.yml +++ b/.github/workflows/changelog-draft.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - master workflow_dispatch: jobs: diff --git a/.github/workflows/validate-gradle-wrapper.yml b/.github/workflows/validate-gradle-wrapper.yml index f3bd8c6..f56baec 100644 --- a/.github/workflows/validate-gradle-wrapper.yml +++ b/.github/workflows/validate-gradle-wrapper.yml @@ -5,9 +5,9 @@ name: Validate Gradle wrapper on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: validate: diff --git a/.gitignore b/.gitignore index d9581a7..e7222d0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,6 @@ # Log file *.log -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* diff --git a/build.gradle b/build.gradle index fde9367..5d967f6 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,7 @@ dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' // testImplementation project(":") - testImplementation(platform('org.junit:junit-bom:5.10.0')) + testImplementation(platform('org.junit:junit-bom:5.10.1')) testImplementation "org.junit.jupiter:junit-jupiter" testImplementation "org.hamcrest:hamcrest-core:2.2" testImplementation "org.hamcrest:hamcrest-library:2.2" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..ccebba7 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ