Skip to content

Commit d8b9d2d

Browse files
Release 0.0.5 move to maven central
1 parent 3c729e3 commit d8b9d2d

File tree

5 files changed

+72
-80
lines changed

5 files changed

+72
-80
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.gradle
33
build
44
out/
5+
local.properties

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,15 @@ be running the risk of a stack overflow
252252
Download
253253
======
254254

255-
The library is available on **JCenter**. Note that it is still in early development
255+
The library is available on **Maven Central**. Note that it is still in early development
256256
and things might change with subsequent versions.
257257

258258
To use it in your project, add the following to your project
259259

260260
- Gradle:
261261

262262
```groovy
263-
compile 'com.savvasdalkitsis:json-merge:0.0.4'
263+
compile 'com.savvasdalkitsis:json-merge:0.0.5'
264264
```
265265

266266
- Maven:
@@ -269,7 +269,7 @@ compile 'com.savvasdalkitsis:json-merge:0.0.4'
269269
<dependency>
270270
<groupId>com.savvasdalkitsis</groupId>
271271
<artifactId>json-merge</artifactId>
272-
<version>0.0.4</version>
272+
<version>0.0.5</version>
273273
</dependency>
274274
```
275275

build.gradle

Lines changed: 62 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.21'
2+
ext.kotlin_version = '1.5.10'
33

44
ext.dev_name = 'Savvas Dalkitsis'
55
ext.dev_email = 'kurosavvas@gmail.com'
@@ -9,120 +9,108 @@ buildscript {
99
ext.project_description = 'json-merge is a library for merging json files for the JVM written in Kotlin'
1010
ext.project_group = 'com.savvasdalkitsis'
1111
ext.project_artifact = 'json-merge'
12-
ext.project_version = '0.0.4'
12+
ext.project_version = '0.0.5'
1313
ext.project_license = 'The Apache Software License, Version 2.0'
1414
ext.project_license_tag = 'Apache-2.0'
1515
ext.project_license_url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
1616

1717
repositories {
1818
mavenCentral()
19-
jcenter()
2019
}
2120
dependencies {
2221
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
23-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
2422
}
2523
}
2624

27-
apply plugin: 'java'
28-
apply plugin: 'kotlin'
29-
apply plugin: 'maven-publish'
30-
apply plugin: 'com.jfrog.bintray'
31-
32-
sourceCompatibility = 1.5
25+
plugins {
26+
id 'java'
27+
id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
28+
id 'signing'
29+
id 'maven'
30+
}
3331

3432
repositories {
3533
mavenCentral()
3634
}
3735

3836
dependencies {
39-
compile (
40-
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version",
41-
"org.json:json:20180130",
37+
implementation (
38+
"org.json:json:20180130",
4239
)
43-
testCompile (
44-
'junit:junit:4.11',
45-
"com.shazam:shazamcrest:0.11",
40+
testImplementation (
41+
'junit:junit:4.13.2',
42+
"com.shazam:shazamcrest:0.11",
4643
)
4744
}
4845

46+
group project_group
47+
version project_version
48+
archivesBaseName = project_artifact
49+
50+
sourceCompatibility = 1.8
51+
4952
compileKotlin {
5053
kotlinOptions.jvmTarget = "1.8"
5154
}
55+
5256
compileTestKotlin {
5357
kotlinOptions.jvmTarget = "1.8"
5458
}
5559

56-
task sourcesJar(type: Jar, dependsOn: classes) {
60+
task sourcesJar(type: Jar) {
5761
classifier = 'sources'
5862
from sourceSets.main.allSource
5963
}
6064

61-
task javadocJar(type: Jar, dependsOn: javadoc) {
65+
task javadocJar(type: Jar) {
6266
classifier = 'javadoc'
63-
from javadoc.destinationDir
67+
from javadoc
6468
}
6569

66-
publishing {
67-
publications {
68-
maven(MavenPublication) {
69-
from components.java
70-
groupId project_group
71-
artifactId project_artifact
72-
version project_version
73-
artifact sourcesJar
74-
artifact javadocJar
75-
pom.withXml {
76-
asNode().children().last() + {
77-
resolveStrategy = Closure.DELEGATE_FIRST
78-
name project_name
79-
description project_description
70+
artifacts {
71+
archives javadocJar, sourcesJar
72+
}
73+
74+
signing {
75+
sign configurations.archives
76+
}
77+
78+
uploadArchives {
79+
repositories {
80+
mavenDeployer {
81+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
82+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
83+
authentication(userName: ossrhUsername, password: ossrhPassword)
84+
}
85+
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
86+
authentication(userName: ossrhUsername, password: ossrhPassword)
87+
}
88+
pom.project {
89+
name project_name
90+
packaging 'jar'
91+
artifactId project_artifact
92+
description project_description
93+
url "https://github.com/$github_name/$project_name"
94+
scm {
8095
url "https://github.com/$github_name/$project_name"
81-
scm {
82-
url "https://github.com/$github_name/$project_name"
83-
connection "scm:git:git://github.com/$github_name/${project_name}.git"
84-
developerConnection "scm:git:ssh:git@github.com:$github_name/${project_name}.git"
85-
}
86-
licenses {
87-
license {
88-
name project_license
89-
url project_license_url
90-
distribution 'repo'
91-
}
96+
connection "scm:git:git://github.com/$github_name/${project_name}.git"
97+
developerConnection "scm:git:ssh:git@github.com:$github_name/${project_name}.git"
98+
}
99+
licenses {
100+
license {
101+
name project_license
102+
url project_license_url
103+
distribution 'repo'
92104
}
93-
developers {
94-
developer {
95-
id github_name
96-
name dev_name
97-
email dev_email
98-
}
105+
}
106+
developers {
107+
developer {
108+
id github_name
109+
name dev_name
110+
email dev_email
99111
}
100112
}
101113
}
102114
}
103115
}
104-
}
105-
106-
bintray {
107-
user = BINTRAY_USER
108-
key = BINTRAY_API_KEY
109-
publications = ['maven']
110-
pkg {
111-
repo = 'maven'
112-
name = project_name
113-
desc = project_description
114-
licenses = [project_license_tag]
115-
publicDownloadNumbers = true
116-
websiteUrl = "https://github.com/$github_name/$project_name"
117-
issueTrackerUrl = "https://github.com/$github_name/$project_name/issues"
118-
vcsUrl = "https://github.com/$github_name/${project_name}.git"
119-
githubRepo = "$github_name/$project_name"
120-
version {
121-
name = project_version
122-
vcsTag = project_version
123-
gpg {
124-
sign = true
125-
}
126-
}
127-
}
128116
}

gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
BINTRAY_USER=
2-
BINTRAY_API_KEY=
1+
ossrhUsername=
2+
ossrhPassword=
3+
signing.keyId=
4+
signing.password=
5+
signing.secretKeyRingFile=

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip

0 commit comments

Comments
 (0)