8.3.0 (#50)

* [Feature] Dynamic state parent group (#48)

* feat: add parentGroup field in createState message

* bump SDK and TP Api version

* Change parameter order

* feat: use the name from the category of the categoryId if parentGroup isn't specified

* fix: typo's in stateId
fix: use correct categoryId

* fix: add check for category id from constants

* fix: break outer loop

* feat: add CategoryHelper.getCategoryShortId method

* core: Upgrade dependencies

* core: Upgrade Gradle version to 7.5.1

* core: Upgrade Gradle version to 7.5.1

* core: Upgrade Gradle version to 7.5.1

* core: Upgrade Gradle version to 7.5.1

* core: Upgrade Gradle version to 7.5.1

Co-authored-by: Pjiesco <55349095+Pjiesco@users.noreply.github.com>

Author: ChristopheCVB

.github/workflows/develop.yml

@@ -5,8 +5,24 @@ on:
     branches: [ develop ]
 
 jobs:
+  prepare-maven-local:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          java-package: jdk
+      - name: Gradle Plugin Publish Local
+        run: |
+          ./gradlew :Packager:publishToMavenLocal
+
   build:
 
+    needs: prepare-maven-local
     runs-on: ubuntu-latest
 
     steps:

Packager/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group 'com.christophecvb.touchportal'
 def localArchiveBaseName = 'plugin-packager'
-version versionName + (isRelease ? '' : '-' + System.currentTimeMillis())
+version versionName
 
 pluginBundle {
     website = 'https://github.com/ChristopheCVB/TouchPortalPluginSDK'

Packager/src/main/groovy/com/christophecvb/touchportal/packager/TouchPortalPluginPackager.groovy

@@ -37,6 +37,8 @@ class TouchPortalPluginPackager implements Plugin<Project> {
         project.tasks.withType(Jar) { task ->
             task.dependsOn project.configurations.runtimeClasspath
 
+            task.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
             task.doFirst {
                 manifest {
                     attributes 'Implementation-Title': "${extension.mainClassSimpleName.get()}",

SampleJava/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'com.github.gmazzo.buildconfig' version '3.0.0'
-    id 'com.christophecvb.touchportal.plugin-packager' version '8.0.0-SNAPSHOT'
+    id 'com.christophecvb.touchportal.plugin-packager' version "$versionName+"
 }
 
 def mainClassSimpleName = 'TouchPortalSampleJavaPlugin'

SampleKotlin/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.kapt' version '1.5.0'
     id 'java'
     id 'com.github.gmazzo.buildconfig' version '3.0.0'
-    id 'com.christophecvb.touchportal.plugin-packager' version '8.0.0-SNAPSHOT'
+    id 'com.christophecvb.touchportal.plugin-packager' version "$versionName+"
 }
 
 def mainClassSimpleName = 'TouchPortalSampleKotlinPlugin'

build.gradle

@@ -5,8 +5,8 @@ allprojects {
 }
 
 ext.versionMajor = 8
-ext.versionMinor = 2
-ext.versionPatch = 1
+ext.versionMinor = 3
+ext.versionPatch = 0
 
 ext.isRelease = System.getenv('IS_RELEASE') == 'YES'
 
@@ -16,4 +16,4 @@ ext.versionName = "${versionMajor}.${versionMinor}.${versionPatch}" + (ext.isRel
 ext.envOrPropOrEmpty = { String name ->
     def value = System.getenv(name) ? System.getenv(name) : findProperty(name)
     return value ? value.toString() : ''
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,3 +1,11 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = 'TouchPortalPluginSDK'
 include 'Annotations'
 include 'Helpers'
@@ -6,4 +14,3 @@ include 'Library'
 include 'SampleJava'
 include 'SampleKotlin'
 include 'Packager'
-