Skip to content

Commit 151956d

Browse files
author
Wiki
committed
从jcenter迁移到mavenCentral
1 parent c94f24b commit 151956d

15 files changed

+137
-71
lines changed

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/codeStyles/Project.xml

-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
buildscript {
5959
repositories {
6060
...
61-
jcenter()
61+
mavenCentral()
6262
maven { url 'http://developer.huawei.com/repo/' }
6363
}
6464
dependencies {
@@ -69,6 +69,7 @@ buildscript {
6969
allprojects {
7070
repositories {
7171
...
72+
mavenCentral()
7273
jcenter()
7374
maven { url 'http://developer.huawei.com/repo/' }
7475
}
@@ -95,12 +96,12 @@ android {
9596
}
9697
}
9798
dependencies {
98-
implementation 'com.mixpush:mixpush-core:2.1.1'// 核心包
99-
implementation 'com.mixpush:mixpush-mi:2.1.1' // 小米推送
100-
implementation 'com.mixpush:mixpush-meizu:2.1.1' // 魅族推送
101-
implementation 'com.mixpush:mixpush-huawei:2.1.1' // 华为推送
102-
implementation 'com.mixpush:mixpush-oppo:2.1.1' // OPPO推送
103-
implementation 'com.mixpush:mixpush-vivo:2.1.1' // VIVO推送
99+
implementation 'io.github.mixpush:mixpush-core:2.3.1'// 核心包
100+
implementation 'io.github.mixpush:mixpush-mi:2.3.1' // 小米推送
101+
implementation 'io.github.mixpush:mixpush-meizu:2.3.1' // 魅族推送
102+
implementation 'io.github.mixpush:mixpush-huawei:2.3.1' // 华为推送
103+
implementation 'io.github.mixpush:mixpush-oppo:2.3.1' // OPPO推送
104+
implementation 'io.github.mixpush:mixpush-vivo:2.3.1' // VIVO推送
104105
}
105106
```
106107

@@ -221,15 +222,15 @@ MixPushClient.getInstance().getRegisterId(this, new GetRegisterIdCallback() {
221222
```xml
222223
<repositories>
223224
<repository>
224-
<id>mixpush</id>
225-
<url>https://dl.bintray.com/mixpush/maven/</url>
225+
<id>maven2</id>
226+
<url>https://repo.maven.apache.org/maven2</url>
226227
</repository>
227228
</repositories>
228229
<dependencies>
229230
<dependency>
230-
<groupId>com.mixpush</groupId>
231+
<groupId>io.github.mixpush</groupId>
231232
<artifactId>mixpush-sender</artifactId>
232-
<version>2.1.1</version>
233+
<version>2.3.1</version>
233234
<type>pom</type>
234235
</dependency>
235236
</dependencies>

build.gradle

+14-20
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,43 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.72'
4+
ext.kotlin_version = '1.4.32'
55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
maven { url 'http://developer.huawei.com/repo/' }
9-
maven { url 'https://dl.bintray.com/mixpush/maven/' }
109
}
1110
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.6.0'
11+
classpath 'com.android.tools.build:gradle:4.2.1'
1312
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1413
classpath 'com.huawei.agconnect:agcp:1.3.1.300'
15-
16-
classpath 'com.novoda:bintray-release:0.9.2'
1714
}
1815
}
1916

2017
allprojects {
2118
repositories {
2219
google()
20+
mavenCentral()
2321
jcenter()
2422
maven { url 'http://developer.huawei.com/repo/' }
25-
maven { url 'https://dl.bintray.com/mixpush/maven/' }
2623
}
2724
}
2825

2926
task clean(type: Delete) {
3027
delete rootProject.buildDir
3128
}
3229

33-
subprojects {
34-
apply plugin: 'maven'
35-
uploadArchives {
36-
repositories {
37-
mavenDeployer {
38-
// repository(url: uri('/Users/Wiki/Downloads/repo'))
39-
}
40-
}
41-
}
42-
}
43-
allprojects {
44-
// repositories {
45-
// jcenter()
30+
//subprojects {
31+
// apply plugin: 'maven'
32+
// uploadArchives {
33+
// repositories {
34+
// mavenDeployer {
35+
//// repository(url: uri('/Users/Wiki/Downloads/repo'))
36+
// }
37+
// }
4638
// }
39+
//}
40+
allprojects {
4741
tasks.withType(Javadoc) {
4842
options.addStringOption('Xdoclint:none', '-quiet')
4943
options.addStringOption('encoding', 'UTF-8')
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jun 17 15:33:35 CST 2020
1+
#Mon Apr 19 20:13:26 CST 2021
22
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-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

huaweipush-server-sdk/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ dependencies {
1515
sourceCompatibility = "1.8"
1616
targetCompatibility = "1.8"
1717

18-
//apply from: '../maven_public.gradle'
18+
19+
20+
apply from: '../maven_public.gradle'

maven_public.gradle

+83-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,86 @@
1-
group = "com.mixpush"
2-
version = "2.1.1"
1+
group = "io.github.mixpush"
2+
version = "2.3.1"
33

44
apply plugin: 'maven'
5-
apply plugin: 'com.novoda.bintray-release'
6-
publish {
7-
userOrg = "mixpush"
8-
groupId = group
9-
artifactId = project.name
10-
publishVersion = version
11-
desc = "集成六大厂家推送,推送到达率高达90%以上"
12-
website = "https://github.com/taoweiji/MixPush"
13-
dryRun = false
5+
apply plugin: 'signing'
6+
7+
8+
signing {
9+
sign configurations.archives
10+
}
11+
boolean isAndroid = project.getPlugins().hasPlugin('com.android.library')
12+
if (isAndroid) {
13+
task androidJavadocs(type: Javadoc) {
14+
source = android.sourceSets.main.java.source
15+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
16+
excludes = ['**/*.kt']
17+
}
18+
19+
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
20+
classifier = 'javadoc'
21+
from androidJavadocs.destinationDir
22+
}
23+
24+
task androidSourcesJar(type: Jar) {
25+
classifier = 'sources'
26+
from android.sourceSets.main.java.source
27+
}
28+
} else {
29+
task javadocJar(type: Jar) {
30+
classifier = 'javadoc'
31+
from javadoc
32+
}
33+
34+
task sourcesJar(type: Jar) {
35+
classifier = 'sources'
36+
from sourceSets.main.allSource
37+
}
38+
artifacts {
39+
archives javadocJar, sourcesJar
40+
}
41+
}
42+
43+
uploadArchives {
44+
repositories {
45+
mavenDeployer {
46+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
47+
48+
repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
49+
authentication(userName: ossrhUsername, password: ossrhPassword)
50+
}
51+
52+
snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
53+
authentication(userName: ossrhUsername, password: ossrhPassword)
54+
}
55+
56+
pom.project {
57+
name 'MixPush'
58+
packaging isAndroid ? 'jar' : 'aar'
59+
// optionally artifactId can be defined here
60+
description 'A application used as an example on how to set up pushing its components to the Central Repository . '
61+
url 'https://github.com/taoweiji/MixPush'
62+
63+
scm {
64+
connection 'scm:git:git@github.com:taoweiji/MixPush.git'
65+
developerConnection 'scm:git:git@github.com:taoweiji/MixPush.git'
66+
url 'https://github.com/taoweiji/MixPush'
67+
}
68+
69+
licenses {
70+
license {
71+
name 'The Apache License, Version 2.0'
72+
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
73+
}
74+
}
75+
76+
developers {
77+
developer {
78+
id 'taoweiji2008'
79+
name 'Wiki'
80+
email 'taoweiji2008@qq.com'
81+
}
82+
}
83+
}
84+
}
85+
}
1486
}

mixpush-huawei/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ android {
1919
}
2020
allprojects {
2121
repositories {
22-
jcenter()
2322
maven { url 'http://developer.huawei.com/repo/' }
2423
}
2524
}

mixpush-sender/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ dependencies {
77
api 'org.apache.httpcomponents:httpclient:4.5.12'
88
api 'com.alibaba:fastjson:1.2.71'
99
api 'org.apache.httpcomponents:httpmime:4.5.12'
10-
api 'com.mixpush:opush-server-sdk:1.0.5'
10+
api 'io.github.mixpush:opush-server-sdk:2.3.1'
1111
// vivo依赖
12-
api 'com.mixpush:vpush-server-sdk:2.2.0'
12+
api 'io.github.mixpush:vpush-server-sdk:2.3.0'
1313
api 'org.apache.httpcomponents:httpclient:4.5.12'
1414
api 'com.alibaba:fastjson:1.2.71'
1515
api 'org.apache.httpcomponents:httpmime:4.5.12'
1616
// xiaomi依赖
17-
api 'com.mixpush:mipush-server-sdk:2.2.21'
17+
api 'io.github.mixpush:mipush-server-sdk:2.3.0'
1818
api 'com.googlecode.json-simple:json-simple:1.1'
1919
// meizu依赖
2020
api 'com.meizu.flyme:push-server-sdk:1.2.8.20190114_release'
2121
// huawei依赖
2222
// api project(path: ':huaweipush-server-sdk')
23-
api 'com.mixpush:huaweipush-server-sdk:2.0.0'
23+
api 'io.github.mixpush:huaweipush-server-sdk:2.3.0'
2424
api 'org.apache.commons:commons-lang3:3.9'
2525
api 'com.google.guava:guava:26.0-jre'
2626
api 'org.slf4j:slf4j-api:1.7.26'
@@ -37,4 +37,4 @@ sourceCompatibility = "1.8"
3737
targetCompatibility = "1.8"
3838

3939

40-
apply from: '../maven_public.gradle'
40+
//apply from: '../maven_public.gradle'

settings.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ include ':mixpush-core'
1111

1212

1313
include ':mixpush-sender'
14-
include ':huaweipush-server-sdk'
14+
15+
//include ':huaweipush-server-sdk'
16+
//include ':opush-server-sdk'
17+
//include ':vpush-server-sdk'
18+
//include ':mipush-server-sdk'
1519
//include ':mixpush-server-mi'
1620
//include ':mixpush-server-huawei'
1721
//include ':mixpush-server-oppo'

0 commit comments

Comments
 (0)