Skip to content

Commit

Permalink
refactor: move src out of lib
Browse files Browse the repository at this point in the history
  • Loading branch information
favna committed Nov 8, 2023
1 parent 051e9b2 commit 2b6f45e
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ You can find the `key id` by running `gpg --list-keys`
Once you have the keys exported you can copy the `gradle.properties.template` file
to `gradle.properties` and fill in the `signing.key`, and `signing.password` with the correct values.

Alternatively you can set `task.enabled` to `false` in `lib/build.gradle` to disable signing:
Alternatively you can set `task.enabled` to `false` in `build.gradle.kts` to disable signing:
```gradle
tasks.whenTaskAdded { task ->
if (task.name.contains("signArchives")) {
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
PGP_SIGNING_PASSWORD: ${{ secrets.PGP_SIGNING_PASSWORD }}
- name: Prepare building Java Code [Fork]
if: github.event.pull_request != null && github.event.pull_request.head.repo.full_name != github.repository
working-directory: lib
shell: bash
run: |
if [ $OS = 'macos-latest' ]; then
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/static-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ jobs:
PGP_SIGNING_PASSWORD: ${{ secrets.PGP_SIGNING_PASSWORD }}
- name: Add static files
run: |
printf "User-agent: *\nDisallow:" > lib/build/docs/javadoc/robots.txt
printf "This file prevents GitHub Pages from using Jekyll." >> lib/build/docs/javadoc/.nojekyll
cp .gitignore lib/build/docs/javadoc
cp LICENSE.md lib/build/docs/javadoc
cp README.md lib/build/docs/javadoc
printf "User-agent: *\nDisallow:" > build/docs/javadoc/robots.txt
printf "This file prevents GitHub Pages from using Jekyll." >> build/docs/javadoc/.nojekyll
cp .gitignore build/docs/javadoc
cp LICENSE.md build/docs/javadoc
cp README.md build/docs/javadoc
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: lib/build/docs/javadoc
path: build/docs/javadoc
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# From https://github.com/github/gitignore/blob/main/Gradle.gitignore
.gradle
lib/build/
build/
gradle.properties

# IntelliJ
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ plugins {

rootProject.name = "result"

include("lib")

gradleEnterprise {
if (System.getenv("CI") != null) {
buildScan {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void itShouldPassErrIfPredicateIsFalse() {

@Test
void isShouldPassOkOnlyIfPredicateIsTrue() {
Result<String> t1 = Result.from(() -> "yo mama").filter(s -> s.length() > 0);
Result<String> t1 = Result.from(() -> "yo mama").filter(s -> !s.isEmpty());
Result<String> t2 = Result.from(() -> "yo mama").filter(s -> false);

assertTrue(t1.isOk());
Expand Down

0 comments on commit 2b6f45e

Please sign in to comment.