Merge pull request #171 from SpineEventEngine/bundle-keep-up

Bundle keep-up

Author: dmdashenkov

.github/keys/firebase-sa.json.gpg

@@ -0,0 +1,2 @@
+�	2�.y�:���Ң
F����`�J�1$�����9��������D
~�z�e��!yu��GBU��2�K�0�!��	����q=���˂p�������@z����e�qB�>�R#�qj�?�1��m굘U��^�2��*���k��J�	3�w�q84}.
+�2��M<�

.github/keys/gradle-plugin-portal.secret.properties.gpg

@@ -1,6 +1,6 @@
 name: Build under Ubuntu
 
-on: pull_request
+on: push
 
 jobs:
   build:

.github/workflows/build-on-ubuntu.yml

@@ -0,0 +1,39 @@
+name: Run integration tests
+
+on: push
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v2
+        with:
+          java-version: 8
+          distribution: zulu
+          cache: gradle
+
+      - name: Pull config
+        run: git submodule update --init --recursive
+
+      - name: Ensure test resource directory exists
+        run: mkdir ./integration-tests/test-app/src/main/resources/
+        shell: bash
+
+      - name: Decrypt Firebase service account key
+        run: ./config/scripts/decrypt.sh "$FIREBASE_SA_KEY" ./.github/keys/firebase-sa.json.gpg ./integration-tests/test-app/src/main/resources/spine-dev.json
+        shell: bash
+        env:
+          FIREBASE_SA_KEY: ${{ secrets.FIREBASE_SA_KEY }}
+
+      - name: Build project and run tests
+        shell: bash
+        run: ./gradlew integrationTest --stacktrace

.github/workflows/integration-test.yml

@@ -42,6 +42,14 @@ jobs:
         env:
           MAVEN_PUBLISHER_KEY: ${{ secrets.MAVEN_PUBLISHER_KEY }}
 
+      - name: Decrypt Git SSH credentials
+        run: ./config/scripts/decrypt.sh "$GRADLE_PORTAL_CREDENTIALS_KEY" ./.github/keys/gradle-plugin-portal.secret.properties.gpg ./gradle-plugin-portal.secret.properties
+        env:
+          GRADLE_PORTAL_CREDENTIALS_KEY: ${{ secrets.GRADLE_PORTAL_CREDENTIALS_KEY }}
+
+      - name: Append Gradle properties
+        run: cat ./gradle-plugin-portal.secret.properties >> ./gradle.properties
+
       - name: Publish artifacts to Maven
         run: ./gradlew build publish --stacktrace
         env:

.github/workflows/publish.yml

@@ -46,12 +46,14 @@ import io.spine.internal.dependency.OsDetector
 import io.spine.internal.dependency.Protobuf
 import io.spine.internal.dependency.ThreeTen
 import io.spine.internal.gradle.JavadocConfig
-import io.spine.internal.gradle.publish.PublishingRepos
 import io.spine.internal.gradle.Scripts
 import io.spine.internal.gradle.applyGitHubPackages
 import io.spine.internal.gradle.applyStandard
 import io.spine.internal.gradle.forceVersions
 import io.spine.internal.gradle.github.pages.updateGitHubPages
+import io.spine.internal.gradle.publish.PublishingRepos
+import io.spine.internal.gradle.report.license.LicenseReporter
+import io.spine.internal.gradle.report.pom.PomGenerator
 import io.spine.internal.gradle.spinePublishing
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -132,13 +134,6 @@ allprojects {
 }
 
 subprojects {
-    val sourcesRootDir = "$projectDir/src"
-    val generatedRootDir = "$projectDir/generated"
-    val generatedJavaDir = "$generatedRootDir/main/java"
-    val generatedTestJavaDir = "$generatedRootDir/test/java"
-    val generatedSpineDir = "$generatedRootDir/main/spine"
-    val generatedTestSpineDir = "$generatedRootDir/test/spine"
-
     apply {
         plugin("java-library")
         plugin("kotlin")
@@ -148,21 +143,18 @@ subprojects {
         plugin("maven-publish")
     }
 
-    // Apply custom Kotlin script plugins.
     apply {
+        // Apply custom Kotlin script plugins.
         plugin("pmd-settings")
-    }
-
-    // Apply Groovy-based script plugins.
-    apply {
+        // Apply Groovy-based script plugins.
         with(Scripts) {
-            from(projectLicenseReport(project))
-
             from(testOutput(project))
             from(javacArgs(project))
         }
     }
 
+    LicenseReporter.generateReportIn(project)
+
     with(repositories) {
         applyGitHubPackages("base", rootProject)
         applyGitHubPackages("base-types", rootProject)
@@ -173,7 +165,10 @@ subprojects {
 
     JavadocConfig.applyTo(project)
 
-    updateGitHubPages {
+    val spineBaseVersion: String by extra
+    val spineCoreVersion: String by extra
+
+    updateGitHubPages(spineBaseVersion) {
         allowInternalJavadoc.set(true)
         rootFolder.set(rootDir)
     }
@@ -194,9 +189,6 @@ subprojects {
         }
     }
 
-    val spineBaseVersion: String by extra
-    val spineCoreVersion: String by extra
-
     dependencies {
         ErrorProne.apply {
             errorprone(core)
@@ -224,57 +216,29 @@ subprojects {
     }
 
     sourceSets {
+        val generatedRootDir = "$projectDir/generated"
         main {
-            java.srcDirs(generatedJavaDir, "$sourcesRootDir/main/java", generatedSpineDir)
-            resources.srcDirs("$sourcesRootDir/main/resources", "$generatedRootDir/main/resources")
+            java.srcDirs("$generatedRootDir/main/spine")
         }
         test {
-            java.srcDirs(generatedTestJavaDir, "$sourcesRootDir/test/java", generatedTestSpineDir)
-            resources.srcDirs("$sourcesRootDir/test/resources", "$generatedRootDir/test/resources")
+            java.srcDirs("$generatedRootDir/test/spine")
         }
     }
 
-    tasks.register("sourceJar", Jar::class) {
-        from(sourceSets.main.get().allJava)
-        archiveClassifier.set("sources")
-    }
-
-    tasks.register("testOutputJar", Jar::class) {
-        from(sourceSets.main.get().output)
-        archiveClassifier.set("test")
-    }
-
-    tasks.register("javadocJar", Jar::class) {
-        from("$projectDir/build/docs/javadoc")
-        archiveClassifier.set("javadoc")
-
-        dependsOn(tasks.javadoc)
-    }
-
     tasks.test {
         useJUnitPlatform {
             includeEngines("junit-jupiter")
         }
     }
-
-    idea {
-        module {
-            generatedSourceDirs.add(file(generatedJavaDir))
-            testSourceDirs.add(file(generatedTestJavaDir))
-            isDownloadJavadoc = true
-            isDownloadSources = true
-        }
-    }
 }
 
 apply {
-    with(Scripts) {
-        from(jacoco(project))
-        from(repoLicenseReport(project))
-        from(generatePom(project))
-    }
+    from(Scripts.jacoco(project))
 }
 
+PomGenerator.applyTo(project)
+LicenseReporter.mergeAllReports(project)
+
 /**
  * Force transitive dependencies.
  *

.idea/inspectionProfiles/Project_Default.xml

@@ -38,7 +38,7 @@ plugins {
     groovy
     `kotlin-dsl`
     pmd
-    val licenseReportVersion = "1.16"
+    val licenseReportVersion = "2.0"
     id("com.github.jk1.dependency-license-report").version(licenseReportVersion)
 }
 
@@ -50,7 +50,7 @@ repositories {
 
 val jacksonVersion = "2.11.0"
 val googleAuthToolVersion = "2.1.2"
-val licenseReportVersion = "1.16"
+val licenseReportVersion = "2.0"
 val grGitVersion = "3.1.1"
 
 /**