Skip to content

Commit 41c781a

Browse files
committed
migrate maven artifacts to github packages
1 parent 2b2d238 commit 41c781a

10 files changed

Lines changed: 36 additions & 58 deletions

File tree

build.gradle

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
buildscript {
2-
repositories {
3-
maven { url 'https://plugins.gradle.org/m2/' }
4-
}
5-
dependencies {
6-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
7-
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.21'
8-
}
9-
}
10-
11-
rootProject.version = '9.9.0'
1+
rootProject.version = '9.9.0-alpha2'
122
group = 'com.spaceshift'
133

144
allprojects {
155

166
repositories {
177
mavenCentral()
18-
jcenter()
198
}
209

21-
apply plugin: 'java'
22-
apply plugin: 'com.jfrog.bintray'
10+
apply plugin: "java-library"
2311
apply plugin: 'maven-publish'
2412

2513
sourceCompatibility = JavaVersion.VERSION_11
@@ -49,7 +37,7 @@ allprojects {
4937
compileOnly "org.projectlombok:lombok:$lombokVersion"
5038
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
5139

52-
testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
40+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
5341
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
5442
testCompileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
5543
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
@@ -66,6 +54,10 @@ allprojects {
6654
}
6755
}*/
6856

57+
compileJava {
58+
options.encoding = "UTF-8"
59+
}
60+
6961
task sourcesJar(type: Jar, dependsOn: classes) {
7062
afterEvaluate {
7163
getArchiveClassifier().set("sources")
@@ -83,6 +75,17 @@ allprojects {
8375
}
8476

8577
publishing {
78+
repositories {
79+
maven {
80+
name = "GitHubPackages"
81+
url = uri("https://maven.pkg.github.com/javasabr/maven-repo")
82+
credentials {
83+
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
84+
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
85+
}
86+
}
87+
}
88+
8689
publications {
8790
mavenJava(MavenPublication) {
8891
from components.java
@@ -97,29 +100,6 @@ allprojects {
97100
}
98101
}
99102

100-
bintray {
101-
afterEvaluate {
102-
user = project.hasProperty("bintrayUser") ? project.property("bintrayUser") : ""
103-
key = project.hasProperty("bintrayKey") ? project.property("bintrayKey") : ""
104-
publications = ['mavenJava']
105-
pkg {
106-
repo = 'maven'
107-
name = 'com.spaceshift.' + jar.baseName
108-
licenses = ['Apache-2.0']
109-
websiteUrl = 'https://github.com/JavaSaBr/Rlib'
110-
vcsUrl = 'https://github.com/JavaSaBr/RLib.git'
111-
issueTrackerUrl = 'https://github.com/JavaSaBr/RLib/issues'
112-
githubRepo = 'JavaSaBr/RLib'
113-
githubReleaseNotesFile = 'README.md'
114-
version {
115-
name = rootProject.version
116-
desc = rootProject.version
117-
released = new Date()
118-
}
119-
}
120-
}
121-
}
122-
123103
configurations {
124104
testArtifacts.extendsFrom testRuntime
125105
}
@@ -139,6 +119,6 @@ allprojects {
139119
}
140120

141121
wrapper {
142-
gradleVersion = '6.0'
122+
gradleVersion = '7.4.2'
143123
distributionType = Wrapper.DistributionType.ALL
144124
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

rlib-common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":rlib-logger-api")
2+
api project(":rlib-logger-api")
33
}
44

55
jar {

rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import org.jetbrains.annotations.NotNull;
44

55
/**
6-
* Реализация быстрого рандоминайзера на основе псевдорандом генератора.
7-
*
86
* @author JavaSaBr
97
*/
108
public final class FastRandom implements Random {

rlib-fx/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
compile project(":rlib-common")
6+
api project(":rlib-common")
77
}
88

99
jar {

rlib-logger-impl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compile project(":rlib-common")
2+
api project(":rlib-common")
33
}
44

55
jar {

rlib-logger-slf4j/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(":rlib-logger-api")
3-
compile "org.slf4j:slf4j-api:$sl4jVersion"
2+
api project(":rlib-logger-api")
3+
api "org.slf4j:slf4j-api:$sl4jVersion"
44

55
testRuntime "org.slf4j:slf4j-simple:$sl4jVersion"
66
}

rlib-mail/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compile project(":rlib-common")
3-
compile "javax.mail:mail:$javaxMailVersion"
2+
api project(":rlib-common")
3+
api "javax.mail:mail:$javaxMailVersion"
44

55
testImplementation project(":rlib-testcontainers")
66
}

rlib-network/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jar {
33
}
44

55
dependencies {
6-
compile project(":rlib-common")
7-
compile "io.projectreactor:reactor-core:$projectreactorVersion"
6+
api project(":rlib-common")
7+
api "io.projectreactor:reactor-core:$projectreactorVersion"
88
testRuntimeOnly project(":rlib-logger-impl")
99
}

rlib-testcontainers/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies {
2-
compile project(":rlib-common")
3-
compile "org.testcontainers:testcontainers:$testcontainersVersion"
4-
compile "org.slf4j:slf4j-api:$sl4jVersion"
5-
compile "org.slf4j:slf4j-ext:$sl4jVersion"
2+
api project(":rlib-common")
3+
api "org.testcontainers:testcontainers:$testcontainersVersion"
4+
api "org.slf4j:slf4j-api:$sl4jVersion"
5+
api "org.slf4j:slf4j-ext:$sl4jVersion"
66
// FIXME
7-
compile "com.kohlschutter.junixsocket:junixsocket-common:2.1.1"
8-
compile "com.kohlschutter.junixsocket:junixsocket-native-common:2.1.1"
9-
runtime "org.slf4j:slf4j-simple:$sl4jVersion"
7+
api "com.kohlschutter.junixsocket:junixsocket-common:2.1.1"
8+
api "com.kohlschutter.junixsocket:junixsocket-native-common:2.1.1"
9+
implementation "org.slf4j:slf4j-simple:$sl4jVersion"
1010

1111
testImplementation project(":rlib-mail")
1212
}

0 commit comments

Comments
 (0)