Skip to content

Commit a0c6ac4

Browse files
committed
Update publishing and RAEDME
1 parent 613cd8a commit a0c6ac4

File tree

4 files changed

+27
-52
lines changed

4 files changed

+27
-52
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Mirakle is designed specially for Gradle build system. It works as seamless as p
1818
```groovy
1919
initscript {
2020
repositories {
21-
jcenter()
21+
mavenCentral()
2222
}
2323
dependencies {
24-
classpath "com.instamotor:mirakle:1.4.2"
24+
classpath 'io.github.adambl4:mirakle:1.4.2'
2525
}
2626
}
2727

benchmark/build.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version benchmarkVersion
44

55
//apply plugin: 'maven'
66
//apply plugin: 'maven-publish'
7-
apply plugin: 'com.jfrog.bintray'
87

98
repositories {
109
mavenCentral()
@@ -57,7 +56,7 @@ def pomConfig = {
5756
}
5857
}*/
5958

60-
bintray {
59+
/*bintray {
6160
user = System.getenv('BINTRAY_USER')
6261
key = System.getenv('BINTRAY_API_KEY')
6362
publish = true
@@ -73,13 +72,13 @@ bintray {
7372
version {
7473
name = benchmarkVersion
7574
76-
/*gpg { //TODO
75+
*//*gpg { //TODO
7776
sign = true
7877
passphrase = System.getenv('BINTRAY_GPG_PASSPHRASE')
79-
}*/
78+
}*//*
8079
}
8180
}
82-
}
81+
}*/
8382

8483
task validatePublishing {
8584
doLast {
@@ -90,4 +89,4 @@ task validatePublishing {
9089
}
9190
}
9291

93-
bintrayUpload.dependsOn validatePublishing
92+
//bintrayUpload.dependsOn validatePublishing

build.gradle

+2-13
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,23 @@ buildscript {
1111

1212
dependencies {
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
//classpath 'gradle.plugin.de.fuerstenau:BuildConfigPlugin:1.1.8'
1514
classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.0"
16-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1715
}
1816
}
1917

20-
apply plugin: 'maven-publish'
2118

2219
allprojects {
23-
//apply plugin: 'de.fuerstenau.buildconfig'
2420
apply plugin: 'kotlin'
2521
apply plugin: 'idea'
2622
apply plugin: "com.github.gmazzo.buildconfig"
23+
apply plugin: 'maven-publish'
24+
apply plugin: 'signing'
2725

2826
buildConfig {
2927
buildConfigField "String", "VERSION", "\"${rootProject.version}\""
30-
//buildConfigField("String", "APP_SECRET", "\"Z3JhZGxlLWphdmEtYnVpbGRjb25maWctcGx1Z2lu\"")
3128
buildConfigField 'List<String>', 'TESTED_GRADLE_VERSIONS', 'listOf("6.5", "6.6", "6.7.1", "7.0")'
3229
}
3330

34-
/* buildConfig {
35-
appName = rootProject.name
36-
version = rootProject.version
37-
packageName = rootProject.group
38-
clsName = 'BuildConfig'
39-
buildConfigField 'String[]', 'TESTED_GRADLE_VERSIONS', '{"6.5", "6.6", "6.7.1", "7.0"}'
40-
}*/
41-
4231
repositories {
4332
mavenCentral()
4433
jcenter()

plugin/build.gradle

+18-31
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
group rootProject.group
22
version rootProject.version
33

4-
apply plugin: 'maven-publish'
5-
//apply plugin: 'com.jfrog.bintray'
6-
7-
84
compileKotlin {
95
kotlinOptions {
106
useIR = true
@@ -45,50 +41,42 @@ def pomConfig = {
4541
}
4642

4743
publishing {
44+
repositories {
45+
maven {
46+
credentials {
47+
username = "$ossrhUsername"
48+
password = "$ossrhPassword"
49+
}
50+
51+
//"https://s01.oss.sonatype.org/service/local/"
52+
url = "https://s01.oss.sonatype.org/content/repositories/releases/"
53+
}
54+
}
55+
4856
publications {
4957
MiraklePublication(MavenPublication) {
5058
from components.java
5159

5260
artifact sourcesJar
5361

54-
groupId 'com.instamotor'
62+
groupId 'io.github.adambl4'
5563
artifactId 'mirakle'
5664
version rootProject.version
5765

5866
pom.withXml {
5967
def root = asNode()
6068
root.appendNode('description', 'Gradle plugin to move build process from local to a remote machine.')
6169
root.appendNode('name', 'Mirakle')
62-
root.appendNode('url', 'https://github.com/Instamotor-Labs/mirakle')
70+
root.appendNode('url', 'https://github.com/adambl4/mirakle')
6371
root.children().last() + pomConfig
6472
}
6573
}
6674
}
6775
}
6876

69-
/*bintray {
70-
user = System.getenv('BINTRAY_USER')
71-
key = System.getenv('BINTRAY_API_KEY')
72-
publish = true
73-
74-
pkg {
75-
repo = 'maven'
76-
name = 'mirakle'
77-
licenses = ['Apache-2.0']
78-
vcsUrl = 'https://github.com/Instamotor-Labs/mirakle.git'
79-
issueTrackerUrl = 'https://github.com/Instamotor-Labs/mirakle/issues'
80-
publications = ['MiraklePublication']
81-
82-
version {
83-
name = rootProject.version
84-
85-
*//*gpg { //TODO
86-
sign = true
87-
passphrase = System.getenv('BINTRAY_GPG_PASSPHRASE')
88-
}*//*
89-
}
90-
}
91-
}*/
77+
signing {
78+
sign publishing.publications.MiraklePublication
79+
}
9280

9381
task validatePublishing {
9482
doLast {
@@ -99,5 +87,4 @@ task validatePublishing {
9987
}
10088
}
10189

102-
//bintrayUpload.dependsOn validatePublishing
103-
//publishMiraklePublicationPublicationToMavenLocal
90+
publish.dependsOn validatePublishing

0 commit comments

Comments
 (0)