Merge pull request #190 from xtext/oehme/java-8-support

Java 8 support and Plugin Portal publishing

Author: oehme

.github/workflows/build.yml

@@ -4,38 +4,27 @@ on:
   push:
     branches: 
       - master
-    tags:
-      - '*'
   pull_request:
 
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
-
+    strategy:
+       matrix:
+          java: [1.8]
+          os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-      - id: get_version
-        name: Get Version
-        uses: battila7/get-version-action@v2
+          java-version: ${{ matrix.java }}
       - name: Build
         uses: eskatos/gradle-command-action@v1
         with:
            arguments: build
            dependencies-cache-enabled: true
-      - name: Release on tag
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: eskatos/gradle-command-action@v1
-        env:
-          ORG_GRADLE_PROJECT_bintrayApiKey: ${{ secrets.ORG_GRADLE_PROJECT_BINTRAYAPIKEY }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
-        with: 
-          arguments: release "-PreleaseVersion=${{ steps.get_version.outputs.version }}"
-          dependencies-cache-enabled: true
       - name: Store HTML test report
         uses: actions/upload-artifact@v2
         with:

.github/workflows/release.yml

@@ -0,0 +1,30 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Release
+    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
+      - id: get_version
+        name: Get Version
+        uses: battila7/get-version-action@v2
+      - name: Release
+        uses: eskatos/gradle-command-action@v1
+        env:
+          ORG_GRADLE_PROJECT_gradle.publish.key: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          ORG_GRADLE_PROJECT_gradle.publish.secret: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+        with: 
+          arguments: release "-PreleaseVersion=${{ steps.get_version.outputs.version }}"
+          dependencies-cache-enabled: true
+
+

README.md

@@ -5,4 +5,4 @@ A set of [Gradle](http://gradle.org) plugins to build and use [Xtext](http://xte
 
 The documentation is hosted on the [project's website](http://xtext.github.io/xtext-gradle-plugin/).
 
-To build and install locally run `./gradlew install -Dorg.gradle.project.version=<version>` e.g. with `<version>` set to `1.0.22-SNAPSHOT`.
+To build and install locally run `./gradlew pTML -PreleaseVersion=<version>` e.g. with `<version>` set to `1.0.22-SNAPSHOT`.

build.gradle

@@ -1,44 +1,25 @@
 buildscript {
   repositories {
-    mavenCentral()
     maven {
       url "https://plugins.gradle.org/m2/"
     }
   }
   dependencies {
     classpath 'org.xtext:xtext-gradle-plugin:2.0.2'
-    classpath 'com.github.oehme.sobula:sobula:0.6.7'
     classpath 'com.netflix.nebula:nebula-project-plugin:4.0.1'
+    classpath "com.gradle.publish:plugin-publish-plugin:0.15.0"
   }
 }
 
-allprojects {
-  apply plugin: 'com.github.oehme.sobula.plugin-release'
-
-  group = "org.xtext"
-  bintray.pkg.name = "org.xtext:xtext-gradle-plugin"
-
-  contacts {
-    "[email protected]" {
-      moniker "The Xtext team"
-      roles "owner"
-      github "xtext"
-    }
-  }
-
-  bintray.user = "xtext-team"
-  bintray.pkg.version.mavenCentralSync.user = "xtext.team"
+apply from: "${rootDir}/gradle/xtend-bootstrap.gradle"
 
+allprojects {
   repositories {
     mavenCentral()
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
   }
 }
 
 subprojects {
-  apply plugin: 'eclipse'
   apply plugin: 'java'
 
   sourceCompatibility = 1.8
@@ -48,57 +29,7 @@ subprojects {
   }
 
   dependencies {
-    compile gradleApi()
-    compile 'com.google.guava:guava:27.1-jre'
     testCompile 'junit:junit:4.12'
     testCompile 'org.ow2.asm:asm:6.1.1'
   }
 }
-
-configure(subprojects.findAll{p-> !p.name.contains('protocol')}) {
-  apply plugin: 'org.xtext.xtend'
-  sourceJar.dependsOn generateXtext
-}
-
-apply from: "${rootDir}/gradle/xtend-bootstrap.gradle"
-
-configure(subprojects.findAll{p-> p.name.contains('plugin')}){
-  apply plugin: 'java-gradle-plugin'
-  apply plugin: 'nebula.facet'
-
-  jar {
-    manifest {
-      attributes("Implementation-Version": project.version)
-    }
-  }
-
-  facets {
-    integTest {
-      parentSourceSet = 'test'
-      testTaskName = 'minimumIntegrationTest'
-    }
-  }
-
-  tasks.withType(Test) {
-    def testkitDir = System.getenv("CI") ? gradle.gradleUserHomeDir : "$rootDir/testkit-dir"
-    systemProperty 'gradle.project.version', version
-    systemProperty 'org.gradle.testkit.dir', testkitDir
-  }
-
-  minimumIntegrationTest {
-    dependsOn("install")
-    reports.html.destination = file("$testReportDir/$name")
-    reports.junitXml.destination = file("$testResultsDir/$name")
-    systemProperty 'xtext.version', minimumXtextVersion
-  }
-
-  task latestIntegrationTest(type: Test) {
-    classpath = minimumIntegrationTest.classpath
-    testClassesDirs = minimumIntegrationTest.testClassesDirs
-    dependsOn("install")
-    systemProperty 'xtext.version', latestXtextVersion
-    enabled = JavaVersion.current().java8Compatible
-  }
-
-  check.dependsOn(latestIntegrationTest)
-}

gradle.properties

@@ -1,6 +1,8 @@
 minimumXtextVersion = 2.9.0
 #We can't use 2.11 while we still want Java 6 support
 bootstrapXtextVersion = 2.9.1
-latestXtextVersion = 2.14.0
+latestXtextVersion = 2.25.0
+minimumGradleVersion = 4.3
+latestGradleVersion = 6.9.1
 systemProp.http.connectionTimeout=120000
 systemProp.http.socketTimeout=120000

gradle/xtend-bootstrap.gradle

@@ -1,7 +1,3 @@
-repositories {
-	mavenCentral()
-}
-
 configurations {
 	xtendCompiler {
 		description 'Bootstrap dependencies for the Xtend compiler'
@@ -24,14 +20,14 @@ dependencies {
 
 subprojects {
 	plugins.withId('org.xtext.xtend') {
-	  dependencies {
-	    compile "org.eclipse.xtend:org.eclipse.xtend.lib:$minimumXtextVersion"
-	  }
+	dependencies {
+		compile "org.eclipse.xtend:org.eclipse.xtend.lib:$minimumXtextVersion"
+	}
 
-	  tasks.matching {it.class.simpleName.startsWith('XtextGenerate')}.all {
+	tasks.matching {it.class.simpleName.startsWith('XtextGenerate')}.all {
 			afterEvaluate {
 				xtextClasspath = rootProject.configurations.xtendCompiler
 			}
-	  }
+	}
 	}
 }

settings.gradle

@@ -1,3 +1,3 @@
 rootProject.name = 'xtext-gradle-plugin-root'
 
-include 'xtext-gradle-protocol', 'xtext-gradle-builder', 'xtext-gradle-plugin', 'xtext-idea-gradle-plugin', 'xtext-android-gradle-plugin'
+include 'xtext-gradle-protocol', 'xtext-gradle-builder', 'xtext-gradle-plugin'