Merge pull request #44 from synadia-io/pcgroups-subprojects

Converting PCGroups and CLI to root and subproject for easier building

Author: jnmoyne

.github/workflows/pcgcli.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./pcgroups-cli
+        working-directory: ./pcgroups
     steps:
       - name: Set up JDK
         uses: actions/setup-java@v5
@@ -24,36 +24,15 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Build with Gradle
-        run: chmod +x gradlew && ./gradlew clean dist
-      - name: Build with Maven
-        run: mvn clean package
+        run: chmod +x gradlew && ./gradlew :pcgroups-cli:clean :pcgroups-cli:dist
       - name: Validate artifacts were created
         run: |
-          FILE_PATH="build/cg.jar"
-          if [ -f "$FILE_PATH" ]; then
-            echo "Validation successful: $FILE_PATH was created."
-          else
-            echo "Validation failed: $FILE_PATH was not found."
-            exit 1 # Fails the workflow step
-          fi
-          FILE_PATH="build/cg.zip"
-          if [ -f "$FILE_PATH" ]; then
-            echo "Validation successful: $FILE_PATH was created."
-          else
-            echo "Validation failed: $FILE_PATH was not found."
-            exit 1 # Fails the workflow step
-          fi
-          FILE_PATH="build/cg.tar"
-          if [ -f "$FILE_PATH" ]; then
-            echo "Validation successful: $FILE_PATH was created."
-          else
-            echo "Validation failed: $FILE_PATH was not found."
-            exit 1 # Fails the workflow step
-          fi
-          FILE_PATH="target/cg.jar"
-          if [ -f "$FILE_PATH" ]; then
-            echo "Validation successful: $FILE_PATH was created."
-          else
-            echo "Validation failed: $FILE_PATH was not found."
-            exit 1 # Fails the workflow step
-          fi
+          CLI_BUILD="../pcgroups-cli/build"
+          for f in cg.jar cg.zip cg.tar; do
+            if [ -f "$CLI_BUILD/$f" ]; then
+              echo "Validation successful: $CLI_BUILD/$f was created."
+            else
+              echo "Validation failed: $CLI_BUILD/$f was not found."
+              exit 1
+            fi
+          done

pcgroups-cli/README.md

@@ -66,15 +66,6 @@ Commands:
 ```
 
 ## Building from Source
-The project contains both a Maven pom.xml file and a Gradle project,
-and both are configured to build an executable Java jar named `cg.jar`
-
-### Maven
-```
-mvn clean package
-``` 
-
-will build the `cg.jar` in the `target` folder 
 
 ### Gradle
 ```

pcgroups-cli/build.gradle

@@ -3,24 +3,21 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1' // Apply the shadow plugin
 }
 
-version = "0.1.0"
-def originalShadow = 'pcg-cli-' + version + '-all.jar'
+version = "0.2.0"
+def originalShadow = 'pcgroups-cli-' + version + '-all.jar'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 repositories {
     mavenCentral()
-    mavenLocal()
     maven { url="https://repo1.maven.org/maven2/" }
     maven { url="https://central.sonatype.com/repository/maven-snapshots" }
 }
 
 dependencies {
-    implementation 'io.nats:jnats:2.25.1'
-    implementation 'org.jspecify:jspecify:1.0.0'
-    implementation 'io.synadia:pcgroups:0.1.1-SNAPSHOT'
+    implementation project(':') // ':' means root project which is 'pcgroups'
     implementation 'info.picocli:picocli:4.7.5'
 
     testImplementation 'io.nats:jnats-server-runner:3.1.0'

pcgroups-cli/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME