Merge pull request #67 from Strumenta/single-release

Single release

.github/workflows/check.yml

@@ -18,15 +18,9 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: ${{ matrix.java }}
-    - name: Install Gradle
-      run: |
-        curl -s "https://get.sdkman.io" | bash
-        source "$HOME/.sdkman/bin/sdkman-init.sh"
-        sdk install gradle 8.3
     - name: Build
       env:
         STRUMENTA_PACKAGES_USER: ${{ secrets.STRUMENTA_PACKAGES_USER }}
         STRUMENTA_PACKAGES_TOKEN: ${{ secrets.STRUMENTA_PACKAGES_TOKEN }}
       run: |
-        cd library && gradle build --console=plain --stacktrace
-        cd ../plugin && gradle build --console=plain --stacktrace
+        ./gradlew build --console=plain --stacktrace

.gitignore

@@ -0,0 +1,5 @@
+bin
+.gradle
+**/build
+.idea
+.DS_STORE

build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("net.researchgate.release") version "3.0.2"
+}
+
+allprojects {
+    group = "com.strumenta.kolasu.languageserver"
+}
+
+
+release {
+    buildTasks.set(listOf(":kolasu-languageserver-library:publish", ":kolasu-languageserver-testing:publish", ":kolasu-languageserver-plugin:publishPlugins"))
+    git {
+        requireBranch.set("")
+        pushToRemote.set("origin")
+    }
+}

gradle.properties

@@ -0,0 +1 @@
+version=1.0.3-SNAPSHOT

library/gradlew.bat → gradlew.bat

@@ -1,92 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

library/build.gradle.kts

@@ -13,38 +13,16 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.21")
-
     implementation("com.strumenta.kolasu:kolasu-core:1.5.31")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:0.21.1")
     implementation("org.apache.lucene:lucene-core:9.8.0")
-
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.6.0")
-}
-
-tasks.register<Jar>("testingJar") {
-    from(tasks.getByName("compileTestKotlin"))
-    archiveBaseName = "library-testing"
-}
-
-tasks.register<Jar>("testingSourcesJar") {
-    from(tasks.getByName("compileTestKotlin").outputs)
-    archiveBaseName = "library-testing"
-    archiveClassifier = "sources"
-}
-
-tasks.register<Jar>("testingJavadocJar") {
-    archiveBaseName = "library-testing"
-    archiveClassifier = "javadoc"
 }
 
 java {
     withSourcesJar()
     withJavadocJar()
 }
 
-group = "com.strumenta.kolasu"
-
 val isReleaseVersion = !(project.version as String).endsWith("SNAPSHOT")
 
 publishing {
@@ -54,13 +32,13 @@ publishing {
             val snapshotRepo = URI("https://oss.sonatype.org/content/repositories/snapshots/")
             url = if (isReleaseVersion) releaseRepo else snapshotRepo
             credentials {
-                username = project.properties["ossrhUsername"] as String
-                password = project.properties["ossrhPassword"] as String
+                username = project.properties["ossrhUsername"] as? String
+                password = project.properties["ossrhPassword"] as? String
             }
         }
     }
     publications {
-        create<MavenPublication>("language-server") {
+        create<MavenPublication>("language-server-library") {
             groupId = "com.strumenta.kolasu"
             artifactId = "language-server"
             version = project.version as String
@@ -93,45 +71,10 @@ publishing {
                     developerConnection = "scm:git:ssh:github.com/Strumenta/kolasu-languageserver-library.git"
                 }
             }
-            create<MavenPublication>("language-server-testing") {
-                groupId = "com.strumenta.kolasu"
-                artifactId = "language-server-testing"
-                version = project.version as String
-
-                artifact(tasks.getByName("testingJar"))
-                artifact(tasks.getByName("testingSourcesJar"))
-                artifact(tasks.getByName("testingJavadocJar"))
-
-                pom {
-                    name = "Kolasu language server testing"
-                    description = "Testing helpers for Kolasu language server library"
-                    inceptionYear = "2023"
-                    url = "https://github.com/Strumenta/kolasu-languageserver-library"
-                    licenses {
-                        license {
-                            name = "Apache License, Version 2.0"
-                            url = "https://opensource.org/license/apache-2-0/"
-                        }
-                    }
-                    developers {
-                        developer {
-                            id = "martin-azpillaga"
-                            name = "Martin Azpillaga Aldalur"
-                            email = "[email protected]"
-                        }
-                    }
-                    scm {
-                        url = "https://github.com/Strumenta/kolasu-languageserver-library.git"
-                        connection = "scm:git:git:github.com/Strumenta/kolasu-languageserver-library.git"
-                        developerConnection = "scm:git:ssh:github.com/Strumenta/kolasu-languageserver-library.git"
-                    }
-                }
-            }
         }
     }
 }
 
 signing {
-    sign(publishing.publications.getByName("language-server"))
-    sign(publishing.publications.getByName("language-server-testing"))
+    sign(publishing.publications.getByName("language-server-library"))
 }

plugin/build.gradle.kts

@@ -3,13 +3,9 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "11.6.0"
     id("maven-publish")
     id("java-gradle-plugin")
-    id("net.researchgate.release") version "3.0.2"
     id("com.gradle.plugin-publish") version "1.2.1"
 }
 
-group = "com.strumenta.kolasu"
-version = "1.0.0"
-
 repositories {
     mavenCentral()
     gradlePluginPortal()
@@ -25,7 +21,6 @@ gradlePlugin {
     vcsUrl = "https://github.com/Strumenta/kolasu-languageserver-library"
     plugins {
         create("com.strumenta.kolasu.language-server-plugin") {
-            group = "com.strumenta.kolasu"
             id = "com.strumenta.kolasu.language-server-plugin"
             version = project.version
             displayName = "Kolasu language server plugin"
@@ -35,11 +30,3 @@ gradlePlugin {
         }
     }
 }
-
-release {
-    buildTasks.set(listOf(":publish"))
-    git {
-        requireBranch.set("")
-        pushToRemote.set("origin")
-    }
-}