diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 60dde504..b0aea93f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,11 +9,15 @@ updates: # Maintain Maven Updates - package-ecosystem: "maven" # See documentation for possible values directory: "/" # Location of package manifests + target-branch: "development" + open-pull-requests-limit: 50 schedule: interval: "daily" # Maintain dependencies for GitHub Actions - package-ecosystem: "github-actions" directory: "/" + target-branch: "development" + open-pull-requests-limit: 50 schedule: interval: "daily" diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 523e8143..b5e72dcc 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -30,7 +30,7 @@ jobs: with: upstream_repository: AtlasMediaGroup/TotalFreedomMod upstream_branch: main - target_branch: main + target_branch: development git_pull_args: --ff-only # optional arg use, defaults to simple 'pull' # Step 3: Display a message if 'sync' step had new commits (simple test) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 97e71f0b..603989a1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,3 +27,12 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn -B package --file pom.xml + + # Java 16 Builds + - uses: actions/checkout@v1 + - name: Set up JDK 16 + uses: actions/setup-java@v1 + with: + java-version: 16 + - name: Build with Maven + run: mvn -B package --file pom.xml diff --git a/pom.xml b/pom.xml index a63df040..aee8eed5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ me.totalfreedom TotalFreedomMod - 2021.05 + 2021.06 jar