From 0f49d94876eaf716b3c4cc6e61f3334032a9642e Mon Sep 17 00:00:00 2001 From: Christian De Angelis Date: Wed, 14 Feb 2024 00:33:45 -0500 Subject: [PATCH] Remove symlinks to root gradle.properties Fixes #7 --- build-logic/gradle.properties | 3 ++- generator/gradle.properties | 8 +++++++- release.sh | 13 +++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) mode change 120000 => 100644 build-logic/gradle.properties mode change 120000 => 100644 generator/gradle.properties diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties deleted file mode 120000 index f9007a95..00000000 --- a/build-logic/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -/Users/chr/Documents/ozone/gradle.properties \ No newline at end of file diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties new file mode 100644 index 00000000..a90bea7e --- /dev/null +++ b/build-logic/gradle.properties @@ -0,0 +1,2 @@ +kotlin.code.style=official +org.gradle.jvmargs=-Xmx8g diff --git a/generator/gradle.properties b/generator/gradle.properties deleted file mode 120000 index 7677fb73..00000000 --- a/generator/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -../gradle.properties \ No newline at end of file diff --git a/generator/gradle.properties b/generator/gradle.properties new file mode 100644 index 00000000..48931065 --- /dev/null +++ b/generator/gradle.properties @@ -0,0 +1,7 @@ +POM_GROUP_ID=sh.christian.ozone +POM_VERSION=0.0.6-SNAPSHOT +POM_NAME= +POM_DESCRIPTION= + +kotlin.code.style=official +org.gradle.jvmargs=-Xmx8g diff --git a/release.sh b/release.sh index 852a70df..761a8d54 100755 --- a/release.sh +++ b/release.sh @@ -20,7 +20,10 @@ if [[ -n "$(git status --porcelain)" ]]; then exit 1 fi -sed -i '' "s/-SNAPSHOT//g" gradle.properties +properties_files="$(find . -name gradle.properties)" +for file in $properties_files; do + sed -i '' "s/-SNAPSHOT//g" "$file" +done NEXT_RELEASE="$(awk -F= '/POM_VERSION/ { print $2 }' < gradle.properties)" CURRENT_RELEASE="$(awk -F\" '/sh.christian.ozone:bluesky/ { print $4 }' < gradle/libs.versions.toml)" @@ -28,13 +31,15 @@ sed -i '' "s/$CURRENT_RELEASE/$NEXT_RELEASE/g" gradle/libs.versions.toml sed -i '' "s/$CURRENT_RELEASE/$NEXT_RELEASE/g" README.md git add README.md -git add gradle.properties +git add $properties_files git add gradle/libs.versions.toml git commit -m "Releasing v$NEXT_RELEASE" git tag "v$NEXT_RELEASE" --force -sed -i '' "s/$NEXT_RELEASE/$NEXT_SNAPSHOT_VERSION-SNAPSHOT/g" gradle.properties +for file in $properties_files; do + sed -i '' "s/$NEXT_RELEASE/$NEXT_SNAPSHOT_VERSION-SNAPSHOT/g" "$file" +done -git add gradle.properties +git add $properties_files git commit -m "Prepare next development cycle."