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.

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

Bump library dependencies #142

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ crashlytics.properties
crashlytics-build.properties
fabric.properties

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.html
hs_err_pid*

/agent/src/main/scala/*.sc
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ please squash them into a single commit. Let the PR rain begin!


[open an issue]: https://github.com/kamon-io/Kamon/issues/new
[mailing list]: https://groups.google.com/forum/#!forum/kamon-user
[mailing list]: https://groups.google.com/g/kamon-user
[commit message conventions]: http://spray.io/project-info/contributing/
[CLA]: https://docs.google.com/forms/d/1G_IDrBTFzOMwHvhxfKRBwNtpRelSa_MZ6jecH8lpTlc/viewform
22 changes: 11 additions & 11 deletions agent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ plugins {
id 'scala'
id 'maven-publish'
id 'signing'
id 'com.github.maiflai.scalatest' version '0.31'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'com.github.maiflai.scalatest' version '0.32'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}

configurations {
kamonInstrumentationBundle
}

dependencies {
implementation 'com.typesafe:config:1.3.4'
implementation 'com.typesafe:config:1.4.2'
implementation 'com.blogspot.mydailyjava:weak-lock-free:0.18'

implementation 'org.tinylog:tinylog:1.3.6'
Expand All @@ -38,8 +38,8 @@ dependencies {

implementation files('libs/byte-buddy-1.11.18.jar')

testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation 'org.scalatest:scalatest_2.12:3.0.1'
testImplementation 'org.mockito:mockito-core:2.28.2' // 4.6.x
testImplementation 'org.scalatest:scalatest_2.12:3.2.12'
testImplementation "org.scala-lang:scala-library:${scala_version}"
testImplementation 'org.pegdown:pegdown:1.6.0'
}
Expand All @@ -48,8 +48,8 @@ def agentBootstrapClasses = 'kanela/agent/bootstrap/**'

task bootstrapJar(type: Jar) {
// Output to 'bootstrap.jar'.
baseName = 'bootstrap'
version = null
archiveBaseName = 'bootstrap'
archiveVersion = null

from sourceSets.main.output
include agentBootstrapClasses
Expand All @@ -58,7 +58,7 @@ task bootstrapJar(type: Jar) {
shadowJar.dependsOn bootstrapJar

shadowJar {
baseName = 'kanela-agent'
archiveBaseName = 'kanela-agent'
classifier = null

mergeServiceFiles {
Expand Down Expand Up @@ -88,7 +88,7 @@ shadowJar {
}

dependencies {
exclude('org.projectlombok:lombok:1.18.20')
exclude('org.projectlombok:lombok:1.18.24')
}

doLast {
Expand Down Expand Up @@ -123,7 +123,7 @@ def pomConfig = {
licenses {
license {
name "The Apache Software License, Version 2.0"
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
url "https://www.apache.org/licenses/LICENSE-2.0.txt"
}
}
developers {
Expand Down Expand Up @@ -164,7 +164,7 @@ publishing {
def root = asNode()
root.appendNode('description', 'The Kamon Instrumentation Agent')
root.appendNode('name', 'Kanela')
root.appendNode('url', 'http://kamon.io')
root.appendNode('url', 'https://kamon.io/')
root.children().last() + pomConfig
}
}
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

buildscript {
ext.scala_version = '2.12.11'
ext.scala_version = '2.12.16'
ext.agent_version = project(":agent").version
ext.kamon_agent_dep = "io.kamon:kanela-agent:${agent_version}"

Expand All @@ -42,13 +42,12 @@ allprojects {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}

dependencies {
implementation 'io.vavr:vavr:0.10.3'
compileOnly 'org.projectlombok:lombok:1.18.20'
annotationProcessor 'org.projectlombok:lombok:1.18.20'
implementation 'io.vavr:vavr:0.10.4'
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'

agent(kamon_agent_dep)
}
Expand Down
1 change: 0 additions & 1 deletion project/build.properties

This file was deleted.