From 439517920dbec8b045541755b6b4dce57721bfbe Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Mon, 3 Jun 2024 11:11:24 -0300 Subject: [PATCH] Prepare for 3.4 --- .github/dependabot.yml | 11 ++++------- git/hooks/prepare-forward-merge | 2 +- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 63381738..ba54d5c9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,6 @@ updates: - package-ecosystem: "gradle" target-branch: "main" - milestone: 154 directory: "/" schedule: interval: "daily" @@ -27,8 +26,7 @@ updates: update-types: [ "version-update:semver-major", "version-update:semver-minor" ] - package-ecosystem: "gradle" - target-branch: "3.2.x" - milestone: 152 + target-branch: "3.3.x" directory: "/" schedule: interval: "daily" @@ -46,8 +44,7 @@ updates: update-types: [ "version-update:semver-major", "version-update:semver-minor" ] - package-ecosystem: "gradle" - target-branch: "3.1.x" - milestone: 151 + target-branch: "3.2.x" directory: "/" schedule: interval: "daily" @@ -71,13 +68,13 @@ updates: schedule: interval: weekly - package-ecosystem: github-actions - target-branch: "3.2.x" + target-branch: "3.3.x" milestone: 152 directory: "/" schedule: interval: weekly - package-ecosystem: github-actions - target-branch: "3.1.x" + target-branch: "3.2.x" milestone: 151 directory: "/" schedule: diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index dfc54899..a7e35bff 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -4,7 +4,7 @@ require 'net/http' require 'yaml' require 'logger' -$main_branch = "3.3.x" +$main_branch = "3.4.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN diff --git a/gradle.properties b/gradle.properties index 1a321a9c..c79736f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.parallel=true -version=3.3.1-SNAPSHOT +version=3.4.0-SNAPSHOT