Merge pull request #25 from jburel/dependency

Dependency
ome · Nov 18, 2024 · 12b1822 · 12b1822
2 parents 6f8ed82 + b37092e
commit 12b1822
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 89 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    uses: ome/action-workflows/.github/workflows/gradle_build.yml@v2.1
+    uses: ome/action-workflows/.github/workflows/gradle_build.yml@main
   publish_snapshots:
     if: ${{ github.ref == 'refs/heads/master' && github.repository_owner == 'ome' }}
     needs: build

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,22 +13,26 @@ kotlinDslPluginOptions {
 
 repositories {
     mavenCentral()
-    gradlePluginPortal()
+    maven {
+      setUrl("https://artifacts.openmicroscopy.org/artifactory/maven")
+    }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+
+allprojects {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = JavaVersion.VERSION_1_8.toString()
+        }
+    }
 }
 
 dependencies {
     implementation(kotlin("gradle-plugin"))
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.3")
-    implementation("org.ajoberstar:grgit:1.9.1") {
-        setForce(true)
-    }
-    implementation("org.ajoberstar:gradle-git:1.7.1")
-    implementation("org.ajoberstar:gradle-git-publish:0.3.3")
+    implementation("org.ajoberstar.grgit:grgit-core:5.3.0") 
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.0") 
+    implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
 }
 
 gradlePlugin {
@@ -57,9 +61,5 @@ gradlePlugin {
             id = "org.openmicroscopy.plugin-publishing"
             implementationClass = "org.openmicroscopy.PluginPublishingPlugin"
         }
-        register("release-plugin") {
-            id = "org.openmicroscopy.release"
-            implementationClass = "org.openmicroscopy.ReleasePlugin"
-        }
     }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,23 +10,19 @@ kotlinDslPluginOptions {
     experimentalWarning.set(false)
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 repositories {
-    jcenter()
+    maven {
+      setUrl("https://artifacts.openmicroscopy.org/artifactory/maven")
+    }
+    mavenCentral()
 }
 
 dependencies {
     implementation(kotlin("gradle-plugin"))
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.3")
-    implementation("org.ajoberstar:grgit:1.9.1") {
-        setForce(true)
-    }
-    implementation("org.ajoberstar:gradle-git:1.7.1")
-    implementation("org.ajoberstar:gradle-git-publish:0.3.3")
+    implementation("org.ajoberstar.grgit:grgit-core:5.3.0") 
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.0") 
+    implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
 }
 
 gradlePlugin {

diff --git a/buildSrc/src/main/kotlin/org/openmicroscopy/PluginHelper.kt b/buildSrc/src/main/kotlin/org/openmicroscopy/PluginHelper.kt
@@ -1,6 +1,5 @@
 package org.openmicroscopy
 
-import com.google.common.base.CaseFormat
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -98,7 +97,15 @@ class PluginHelper {
         }
 
         fun Project.camelCaseName(): String {
-            return CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_CAMEL, name)
+            val builder = StringBuilder()
+            for (v in name.split("-")) {
+                if (builder.toString() == "") {
+                    builder.append(v)
+                } else {
+                    builder.append(v.substring(0, 1).toUpperCase()).append(v.substring(1))
+                }
+            }
+            return builder.toString()
         }
     }
 

diff --git a/src/main/kotlin/org/openmicroscopy/ReleasePlugin.kt b/src/main/kotlin/org/openmicroscopy/ReleasePlugin.kt