Remove Nebula plugin and hardcode version in version.gradle.kts (#1343)

.gitignore

@@ -23,6 +23,7 @@ hs_err_pid*
 
 # temporary files
 *.md.tmp
+version.gradle.kts.tmp
 
 # other
 .DS_Store

.gitlab-ci.yml

@@ -41,7 +41,7 @@ snapshot:
   rules:
     - if: '$CI_COMMIT_REF_NAME == "main"'
   script:
-    - ./gradlew snapshot --no-daemon --stacktrace
+    - ./gradlew assemble publishToSonatype --no-daemon --stacktrace
 
 release:
   stage: release

agent/build.gradle.kts

@@ -222,10 +222,6 @@ tasks {
   }
 }
 
-rootProject.tasks.named("release") {
-  finalizedBy(tasks["publishToSonatype"])
-}
-
 licenseReport {
   outputDir = rootProject.file("licenses").absolutePath
 

build.gradle.kts

@@ -1,18 +1,9 @@
-import nebula.plugin.release.git.opinion.Strategies
-
 plugins {
   id("idea")
-  id("nebula.release")
   id("io.github.gradle-nexus.publish-plugin")
 }
 
-release {
-  defaultVersionStrategy = Strategies.getSNAPSHOT()
-}
-
-nebulaRelease {
-  addReleaseBranchPattern("""v\d+\.\d+\.x""")
-}
+apply(from = "version.gradle.kts")
 
 nexusPublishing {
   packageGroup.set("com.splunk")

scripts/pre-release-changes.sh

@@ -75,6 +75,11 @@ else
   sed_flag='-i'
 fi
 
+# version.gradle.kts
+sed ${sed_flag} \
+  -e "s/val distroVersion = \"[^\"]*\"/val distroVersion = \"${splunk_new_version}\"/" \
+   version.gradle.kts
+
 # README.md
 readme_sed_args=(
   # update version placeholders

scripts/release.sh

@@ -28,14 +28,23 @@ fi
 
 release_tag="$1"
 
+validate_project_version() {
+  if (grep SNAPSHOT version.gradle.kts >/dev/null)
+  then
+    echo "Cannot release a SNAPSHOT version!"
+    echo "Did you run the scripts/pre-release-changes.sh script before running the release process?"
+    exit 1
+  fi
+}
+
 build_project() {
   local release_version
   release_version="$(get_release_version "$release_tag")"
 
   mkdir -p dist
 
   echo ">>> Building the javaagent ..."
-  ./gradlew -Prelease.useLastTag=true build final closeAndReleaseSonatypeStagingRepository -x test --no-daemon
+  ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --stacktrace
   mv "agent/build/libs/splunk-otel-javaagent-${release_version}.jar" dist/splunk-otel-javaagent.jar
   mv "agent/build/libs/splunk-otel-javaagent-${release_version}.jar.asc" dist/splunk-otel-javaagent.jar.asc
   mv "agent/build/libs/splunk-otel-javaagent-${release_version}-all.jar" dist/splunk-otel-javaagent-all.jar
@@ -59,6 +68,7 @@ create_gh_release() {
     --title "Release $release_tag"
 }
 
+validate_project_version
 setup_gpg
 import_gpg_secret_key "$GPG_SECRET_KEY"
 build_project

scripts/update-version-after-release.sh

@@ -41,6 +41,11 @@ else
   sed_flag='-i'
 fi
 
+# version.gradle.kts
+sed ${sed_flag} \
+  -e "s/val distroVersion = \"[^\"]*\"/val distroVersion = \"${splunk_next_version}-SNAPSHOT\"/" \
+   version.gradle.kts
+
 # Prepare development version docs warning for the new version
 cat > dev_docs_warning.md.tmp <<EOF
 <!--DEV_DOCS_WARNING_START-->

settings.gradle.kts

@@ -3,7 +3,6 @@ pluginManagement {
     id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-    id("nebula.release") version "17.2.2"
     id("com.github.jk1.dependency-license-report") version "2.4"
   }
 }

version.gradle.kts

@@ -0,0 +1,6 @@
+// do NOT update that variable manually - it is managed by the pre/post release scripts
+val distroVersion = "1.26.0-SNAPSHOT"
+
+allprojects {
+  version = distroVersion
+}