Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Master] Fix the warnings in native-image build #1388

Merged
merged 3 commits into from
Dec 22, 2022
Merged

[Master] Fix the warnings in native-image build #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
618a9a4
Add netty related additional dependencies
TharmiganK Dec 22, 2022
170ee5d
Merge branch 'ballerina-platform:master' into native-image-warnings-fix
TharmiganK Dec 22, 2022
e54b8a6
Update protobuf version
TharmiganK Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,19 @@ dependencies {
externalJars(group: 'org.jvnet.mimepull', name: 'mimepull', version: "${mimepullVersion}") {
transitive = false
}

externalJars(group: 'io.netty', name: 'netty-codec-socks', version: "${nettyVersion}") {
transitive = false
}
externalJars(group: 'net.jpountz.lz4', name: 'lz4', version: "${lz4Version}") {
transitive = false
}
externalJars(group: 'org.jboss.marshalling', name: 'jboss-marshalling', version: "${marshallingVersion}") {
transitive = false
}
externalJars(group: 'com.google.protobuf', name: 'protobuf-java', version: "${protobufVersion}") {
transitive = false
}
}

task updateTomlFiles {
Expand All @@ -145,6 +158,9 @@ task updateTomlFiles {
def stdlibDependentNettyTcnativeVersion = project.nettyTcnativeVersion
def stdlibDependentMimepullVersion = project.mimepullVersion
def stdlibDependentTestngVersion = project.testngVersion
def stdlibDependentLz4Version = project.lz4Version
def stdlibDependentMarshallingVersion = project.marshallingVersion
def stdlibDependentProtobufVersion = project.protobufVersion

def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion)
Expand All @@ -158,6 +174,9 @@ task updateTomlFiles {
newBallerinaToml = newBallerinaToml.replace("@testng.version@", stdlibDependentTestngVersion)
newBallerinaToml = newBallerinaToml.replace("@mime.version@", stdlibDependentMimeVersion)
newBallerinaToml = newBallerinaToml.replace("@constraint.version@", stdlibDependentConstraintVersion)
newBallerinaToml = newBallerinaToml.replace("@lz4.version@", stdlibDependentLz4Version)
newBallerinaToml = newBallerinaToml.replace("@marshalling.version@", stdlibDependentMarshallingVersion)
newBallerinaToml = newBallerinaToml.replace("@protobuf.version@", stdlibDependentProtobufVersion)
ballerinaTomlFile.text = newBallerinaToml

def newCompilerPluginToml = compilerPluginTomlFilePlaceHolder.text.replace("@project.version@", project.version)
Expand Down
24 changes: 24 additions & 0 deletions build-config/resources/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,27 @@ groupId = "org.jvnet.mimepull"
artifactId = "mimepull"
version = "@mimepull.version@"
path = "./lib/[email protected]@.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-socks"
version = "@netty.version@"
path = "./lib/[email protected]@.jar"

[[platform.java11.dependency]]
groupId = "org.jboss.marshalling"
artifactId = "jboss-marshalling"
version = "@marshalling.version@"
path = "./lib/[email protected]@.jar"

[[platform.java11.dependency]]
groupId = "net.jpountz.lz4"
artifactId = "lz4"
version = "@lz4.version@"
path = "./lib/[email protected]@.jar"

[[platform.java11.dependency]]
groupId = "com.google.protobufl"
artifactId = "protobuf-java"
version = "@protobuf.version@"
path = "./lib/[email protected]@.jar"
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ testngVersion=7.4.0
ballerinaGradlePluginVersion=1.0.0
mockitoVersion=3.7.7
gsonVersion=2.7
lz4Version=1.3.0
marshallingVersion=2.0.5.Final
protobufVersion=3.20.3

stdlibIoVersion=1.4.0-20221121-160300-f886df4
stdlibConstraintVersion=1.1.0-20221122-134300-fc2d3aa
Expand Down