Merge pull request #231 from ballerina-platform/mdev

Change the group ID and rename the sub modules

.github/workflows/build-timestamped-master.yml

@@ -36,12 +36,5 @@ jobs:
           publishPAT: ${{ secrets.BALLERINA_BOT_TOKEN }}
         run: |
           ./gradlew publish --scan --no-daemon
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: log-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         uses: codecov/codecov-action@v1

.github/workflows/pull-request.yml

@@ -17,13 +17,6 @@ jobs:
           packageUser: ${{ github.actor }}
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: log-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         if:  github.event_name == 'pull_request'
         uses: codecov/codecov-action@v1

ballerina/Ballerina.toml

@@ -0,0 +1,10 @@
+[package]
+org = "ballerina"
+name = "log"
+version = "@toml.version@"
+
+[[platform.java11.dependency]]
+path = "../native/build/libs/log-native-@project.version@.jar"
+
+[[platform.java11.dependency]]
+path = "../test-utils/build/libs/log-test-utils-@project.version@.jar"

log-ballerina/init.bal → ballerina/init.bal

@@ -37,5 +37,5 @@ function init() returns error? {
 }
 
 isolated function setModule() = @java:Method {
-    'class: "org.ballerinalang.stdlib.log.ModuleUtils"
+    'class: "io.ballerina.stdlib.log.ModuleUtils"
 } external;

log-ballerina/natives.bal → ballerina/natives.bal

@@ -217,6 +217,6 @@ isolated function isLogLevelEnabled(string logLevel) returns boolean {
     return logLevelWeight.get(logLevel) >= logLevelWeight.get(moduleLogLevel);
 }
 
-isolated function getModuleName() returns string = @java:Method {'class: "org.ballerinalang.stdlib.log.Utils"} external;
+isolated function getModuleName() returns string = @java:Method {'class: "io.ballerina.stdlib.log.Utils"} external;
 
-isolated function getCurrentTime() returns string = @java:Method {'class: "org.ballerinalang.stdlib.log.Utils"} external;
+isolated function getCurrentTime() returns string = @java:Method {'class: "io.ballerina.stdlib.log.Utils"} external;

log-ballerina/tests/log_test.bal → ballerina/tests/log_test.bal

@@ -97,4 +97,4 @@ public isolated function main() {
     attempts = isolated function() returns int { return 3;});
 }
 
-isolated function isValidDateTime(string dateTime) returns boolean = @java:Method {'class: "org.ballerinalang.stdlib.log.testutils.utils.OSUtils"} external;
+isolated function isValidDateTime(string dateTime) returns boolean = @java:Method {'class: "io.ballerina.stdlib.log.testutils.utils.OSUtils"} external;

build-config/checkstyle/build.gradle

@@ -21,7 +21,7 @@ plugins {
 
 apply plugin: 'java'
 
-task downloadMultipleFiles(type: Download) {
+task downloadCheckstyleRuleFiles(type: Download) {
     src([
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
@@ -40,9 +40,9 @@ clean {
 }
 
 artifacts.add('default', file("$project.buildDir/checkstyle.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }
 
 artifacts.add('default', file("$project.buildDir/suppressions.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }

build.gradle

@@ -23,7 +23,7 @@ plugins {
 }
 
 allprojects {
-    group = 'org.ballerinalang'
+    group = project.group
     version = project.version
 
     apply plugin: 'jacoco'
@@ -65,8 +65,8 @@ subprojects {
     }
     dependencies {
         /* Standard libraries */
-        ballerinaStdLibs "org.ballerinalang:io-ballerina:${stdlibIoVersion}"
-        ballerinaStdLibs "org.ballerinalang:regex-ballerina:${stdlibRegexVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:regex-ballerina:${stdlibRegexVersion}"
     }
 }
 

codecov.yml

@@ -3,7 +3,7 @@ fixes:
 
 ignore:
   - "**/tests"
-  - "log-test-utils"
+  - "test-utils"
 
 coverage:
   precision: 2

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.caching=true
-group=org.ballerinalang
+group=io.ballerina.stdlib
 version=1.1.0-beta.3-SNAPSHOT
 ballerinaLangVersion=2.0.0-beta.2.1
-stdlibIoVersion=0.6.0-beta.2
-stdlibRegexVersion=0.7.0-beta.2
+stdlibIoVersion=0.6.0-beta.3-20210708-142400-de75ca2
+stdlibRegexVersion=0.7.0-beta.3-20210708-161600-c58ceb5
 testngVersion=6.14.3
 puppycrawlCheckstyleVersion=8.18
-ballerinaGradlePluginVersion=0.9.1
+ballerinaGradlePluginVersion=0.10.0

integration-tests/Ballerina.toml

@@ -0,0 +1,13 @@
+[package]
+org = "ballerina"
+name = "integration_tests"
+version = "@toml.version@"
+
+[[platform.java11.dependency]]
+path = "../native/build/libs/log-native-@project.version@.jar"
+
+[[platform.java11.dependency]]
+path = "../test-utils/build/libs/log-test-utils-@project.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/io-native-@io.native.version@.jar"

log-integration-tests/build.gradle → integration-tests/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
         transitive = false
     }
-    externalJars (group: 'org.ballerinalang', name: 'io-native', version: "${stdlibIoVersion}") {
+    externalJars (group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}") {
         transitive = false
     }
     implementation project(':log-native')
@@ -117,11 +117,11 @@ task copyLogStdlib {
     doLast {
         /* Copy Log module */
         copy {
-            from "$project.rootDir/log-ballerina/build/cache_parent/bala"
+            from "$project.rootDir/ballerina/build/cache_parent/bala"
             into "${ballerinaDist}/repo/bala"
         }
         copy {
-            from "$project.rootDir/log-ballerina/build/cache_parent/cache"
+            from "$project.rootDir/ballerina/build/cache_parent/cache"
             into "${ballerinaDist}/repo/cache"
         }
     }

log-integration-tests/tests/init.bal → integration-tests/tests/init.bal

@@ -21,5 +21,5 @@ isolated function init() {
 }
 
 isolated function setModule() = @java:Method {
-    'class: "org.ballerinalang.stdlib.log.testutils.nativeimpl.ModuleUtils"
+    'class: "io.ballerina.stdlib.log.testutils.nativeimpl.ModuleUtils"
 } external;

log-integration-tests/tests/process.bal → integration-tests/tests/process.bal

@@ -58,16 +58,16 @@ public class Process {
 
 isolated function nativeWaitForExit(Process process) returns int | Error = @java:Method {
     name: "waitForExit",
-    'class: "org.ballerinalang.stdlib.log.testutils.nativeimpl.WaitForExit"
+    'class: "io.ballerina.stdlib.log.testutils.nativeimpl.WaitForExit"
 } external;
 
 isolated function nativeExitCode(Process process) returns int | Error = @java:Method {
     name: "exitCode",
-    'class: "org.ballerinalang.stdlib.log.testutils.nativeimpl.ExitCode"
+    'class: "io.ballerina.stdlib.log.testutils.nativeimpl.ExitCode"
 } external;
 
 isolated function nativeStderr(Process process) returns io:ReadableByteChannel = @java:Method {
     name: "stderr",
-    'class: "org.ballerinalang.stdlib.log.testutils.nativeimpl.Stderr"
+    'class: "io.ballerina.stdlib.log.testutils.nativeimpl.Stderr"
 } external;
 

log-integration-tests/tests/tests_logfmt.bal → integration-tests/tests/tests_logfmt.bal

@@ -294,5 +294,5 @@ isolated function validateLog(string log, string output) {
 function exec(@untainted string command, @untainted map<string> env = {},
                      @untainted string? dir = (), @untainted string... args) returns Process|error = @java:Method {
     name: "exec",
-    'class: "org.ballerinalang.stdlib.log.testutils.nativeimpl.Exec"
+    'class: "io.ballerina.stdlib.log.testutils.nativeimpl.Exec"
 } external;

log-native/build.gradle → native/build.gradle

@@ -26,7 +26,7 @@ description = 'Ballerina - Log Java Utils'
 dependencies {
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"
-    checkstyle project(":build-config:checkstyle")
+    checkstyle project(":checkstyle")
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
 }
 
@@ -72,7 +72,7 @@ tasks.withType(Checkstyle) {
 }
 
 spotbugsMain.finalizedBy validateSpotbugs
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 compileJava {
     doFirst {

log-native/src/main/java/module-info.java → native/src/main/java/module-info.java

@@ -18,5 +18,5 @@
 
 module io.ballerina.stdlib.log {
     requires io.ballerina.runtime;
-    exports org.ballerinalang.stdlib.log;
+    exports io.ballerina.stdlib.log;
 }

log-native/src/main/java/org/ballerinalang/stdlib/log/ModuleUtils.java → native/src/main/java/org/ballerinalang/stdlib/log/ModuleUtils.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log;
+package io.ballerina.stdlib.log;
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Module;

log-native/src/main/java/org/ballerinalang/stdlib/log/Utils.java → native/src/main/java/org/ballerinalang/stdlib/log/Utils.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log;
+package io.ballerina.stdlib.log;
 
 import io.ballerina.runtime.api.utils.IdentifierUtils;
 import io.ballerina.runtime.api.utils.StringUtils;

settings.gradle

@@ -12,9 +12,21 @@ plugins {
 }
 
 rootProject.name = 'log'
-include(':build-config:checkstyle')
+include(':checkstyle')
 include ':log-native', ':log-test-utils', ':log-ballerina', ':log-integration-tests'
 
+include ':checkstyle'
+include ':log-native'
+include ':log-test-utils'
+include ':log-ballerina'
+include ':log-integration-tests'
+
+project(':checkstyle').projectDir = file("build-config${File.separator}checkstyle")
+project(':log-native').projectDir = file('native')
+project(':log-test-utils').projectDir = file('test-utils')
+project(':log-ballerina').projectDir = file('ballerina')
+project(':log-integration-tests').projectDir = file('integration-tests')
+
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'

log-test-utils/build.gradle → test-utils/build.gradle

@@ -26,9 +26,9 @@ description = 'Ballerina - Log Java Utils'
 dependencies {
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"
-    implementation group: 'org.ballerinalang', name: 'io-native', version: "${stdlibIoVersion}"
+    implementation group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}"
     implementation project(":log-native")
-    checkstyle project(":build-config:checkstyle")
+    checkstyle project(":checkstyle")
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
 }
 
@@ -74,7 +74,7 @@ tasks.withType(Checkstyle) {
 }
 
 spotbugsMain.finalizedBy validateSpotbugs
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 compileJava {
     doFirst {

log-test-utils/src/main/java/module-info.java → test-utils/src/main/java/module-info.java

@@ -21,6 +21,6 @@
     requires java.logging;
     requires io.ballerina.stdlib.log;
     requires io.ballerina.stdlib.io;
-    exports org.ballerinalang.stdlib.log.testutils.nativeimpl;
-    exports org.ballerinalang.stdlib.log.testutils.utils;
+    exports io.ballerina.stdlib.log.testutils.nativeimpl;
+    exports io.ballerina.stdlib.log.testutils.utils;
 }

log-test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/Exec.java → test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/Exec.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log.testutils.nativeimpl;
+package io.ballerina.stdlib.log.testutils.nativeimpl;
 
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
-import org.ballerinalang.stdlib.log.testutils.utils.OSConstants;
-import org.ballerinalang.stdlib.log.testutils.utils.OSUtils;
+import io.ballerina.stdlib.log.testutils.utils.OSConstants;
+import io.ballerina.stdlib.log.testutils.utils.OSUtils;
 
 import java.io.File;
 import java.io.IOException;

log-test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/ExitCode.java → test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/ExitCode.java

@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log.testutils.nativeimpl;
+package io.ballerina.stdlib.log.testutils.nativeimpl;
 
 import io.ballerina.runtime.api.values.BObject;
-import org.ballerinalang.stdlib.log.testutils.utils.OSConstants;
-import org.ballerinalang.stdlib.log.testutils.utils.OSUtils;
+import io.ballerina.stdlib.log.testutils.utils.OSConstants;
+import io.ballerina.stdlib.log.testutils.utils.OSUtils;
 
 /**
  * External function for exitCode.

log-test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/ModuleUtils.java → test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/ModuleUtils.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log.testutils.nativeimpl;
+package io.ballerina.stdlib.log.testutils.nativeimpl;
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Module;

log-test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/Stderr.java → test-utils/src/main/java/org/ballerinalang/stdlib/log/testutils/nativeimpl/Stderr.java

@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.ballerinalang.stdlib.log.testutils.nativeimpl;
+package io.ballerina.stdlib.log.testutils.nativeimpl;
 
 import io.ballerina.runtime.api.values.BObject;
-import org.ballerinalang.stdlib.io.channels.AbstractNativeChannel;
-import org.ballerinalang.stdlib.io.channels.BlobChannel;
-import org.ballerinalang.stdlib.io.channels.BlobIOChannel;
-import org.ballerinalang.stdlib.log.testutils.utils.OSUtils;
+import io.ballerina.stdlib.io.channels.AbstractNativeChannel;
+import io.ballerina.stdlib.io.channels.BlobChannel;
+import io.ballerina.stdlib.io.channels.BlobIOChannel;
+import io.ballerina.stdlib.log.testutils.utils.OSUtils;
 
 import java.io.InputStream;
 import java.nio.channels.Channels;