Skip to content

Commit 992bbe3

Browse files
FlyJingFishFlyJingFish
committed
升级版本号
1 parent 5c665e3 commit 992bbe3

File tree

15 files changed

+105
-149
lines changed

15 files changed

+105
-149
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
buildscript {
5252
dependencies {
5353
//必须项 👇
54-
classpath 'io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:1.2.9'
54+
classpath 'io.github.flyjingfish:modulecommunication-plugin:1.3.0'
5555
}
5656
}
5757
```
@@ -163,7 +163,7 @@ b、如果 ```lib-login``` 也没有引入过 ```communication.export``` 插件
163163
```gradle
164164
dependencies {
165165
//必须项 👇（可以直接放在公共 module）
166-
implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:1.2.9'
166+
implementation 'io.github.flyjingfish:modulecommunication-annotation:1.3.0'
167167
}
168168
```
169169

@@ -279,9 +279,9 @@ communicationConfig{
279279
```gradle
280280
dependencies {
281281
//使用拦截器（不是必须的）
282-
implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-intercept:1.2.9'
282+
implementation 'io.github.flyjingfish:modulecommunication-intercept:1.3.0'
283283
//使用路径的方式跳转才需要 （不是必须的）
284-
implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-route:1.2.9'
284+
implementation 'io.github.flyjingfish:modulecommunication-route:1.3.0'
285285
}
286286
```
287287

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
viewBinding = true
3939
}
4040
composeOptions {
41-
kotlinCompilerExtensionVersion = "1.4.3"
41+
kotlinCompilerExtensionVersion = "1.5.11"
4242
}
4343

4444
signingConfigs {

‎build.gradle.kts‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
dependencies {
4-
classpath("io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:${rootProject.properties["TestVersion"]}")
4+
classpath("io.github.flyjingfish:modulecommunication-plugin:${rootProject.properties["TestVersion"]}")
55
// classpath("io.github.FlyJingFish.AndroidAop:android-aop-plugin:2.0.8")
66
}
77
}
88
@Suppress("DSL_SCOPE_VIOLATION")
99
plugins {
10-
id("com.android.application") version "7.4.1" apply false
11-
id("com.android.library") version "7.4.1" apply false
12-
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
13-
id("org.jetbrains.kotlin.jvm") version "1.8.10" apply false
14-
id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1"
15-
id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false
10+
id("com.android.application") version "8.2.2" apply false
11+
id("com.android.library") version "8.2.2" apply false
12+
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
13+
id("org.jetbrains.kotlin.jvm") version "1.9.23" apply false
14+
id("com.vanniktech.maven.publish") version "0.33.0"
15+
id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
1616
alias(libs.plugins.androidAop.plugin)
1717
}
1818
//apply(plugin = "android.aop")
@@ -102,30 +102,20 @@ fun updateLib(readme :String,oldVersionName :String,newVersionName :String) {
102102
fun updateREADME(readme :String,oldVersionName :String,newVersionName :String) {
103103
val configFile = File(readme)
104104
val exportText = configFile.readText()
105-
var text = exportText.replace("io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:$oldVersionName",
106-
"io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:$newVersionName"
105+
var text = exportText.replace("io.github.flyjingfish:modulecommunication-plugin:$oldVersionName",
106+
"io.github.flyjingfish:modulecommunication-plugin:$newVersionName"
107107
)
108-
text = text.replace("io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:$oldVersionName",
109-
"io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:$newVersionName"
108+
text = text.replace("io.github.flyjingfish:modulecommunication-annotation:$oldVersionName",
109+
"io.github.flyjingfish:modulecommunication-annotation:$newVersionName"
110110
)
111-
text = text.replace("io.github.FlyJingFish.ModuleCommunication:module-communication-intercept:$oldVersionName",
112-
"io.github.FlyJingFish.ModuleCommunication:module-communication-intercept:$newVersionName"
111+
text = text.replace("io.github.flyjingfish:modulecommunication-intercept:$oldVersionName",
112+
"io.github.flyjingfish:modulecommunication-intercept:$newVersionName"
113113
)
114-
text = text.replace("io.github.FlyJingFish.ModuleCommunication:module-communication-route:$oldVersionName",
115-
"io.github.FlyJingFish.ModuleCommunication:module-communication-route:$newVersionName"
114+
text = text.replace("io.github.flyjingfish:modulecommunication-route:$oldVersionName",
115+
"io.github.flyjingfish:modulecommunication-route:$newVersionName"
116116
)
117117
configFile.writeText(text)
118118
}
119119
val appVersionName = getAppVName()
120120
group = properties["PROJ_GROUP"].toString()
121-
version = appVersionName
122-
nexusPublishing {
123-
repositories {
124-
create("Nexus") {
125-
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
126-
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
127-
username.set(properties["ossrhUsername"].toString())
128-
password.set(properties["ossrhPassword"].toString())
129-
}
130-
}
131-
}
121+
version = appVersionName

‎gradle.properties‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ kotlin.code.style=official
2222
# thereby reducing the size of the R class for that library
2323
android.nonTransitiveRClass=false
2424
android.defaults.buildfeatures.viewbinding = true
25-
org.gradle.unsafe.configuration-cache=true
26-
org.gradle.unsafe.configuration-cache-problems=warn
25+
#org.gradle.unsafe.configuration-cache=true
26+
#org.gradle.unsafe.configuration-cache-problems=warn
2727

28-
PROJ_GROUP=io.github.FlyJingFish.ModuleCommunication
28+
PROJ_GROUP=io.github.flyjingfish
2929
PROJ_BASENAME=ModuleCommunication
3030

3131
PROJ_WEBSITEURL=https://github.com/FlyJingFish/ModuleCommunication
3232
PROJ_VCSURL=https://github.com/FlyJingFish/ModuleCommunication.git
33-
PROJ_DESCRIPTION=Lightweight Aop for Android platform, you deserve it, action is worse than your heartbeat
33+
PROJ_DESCRIPTION=Android modular/component-based communication framework
3434

3535
DEVELOPER_ID=FlyJingFish
3636
DEVELOPER_NAME=FlyJingFish
3737
DEVELOPER_EMAIL=749617782@qq.com
3838

39-
TestVersion = 1.2.9
39+
TestVersion = 1.3.0
4040
SonatypeTestCode = 1332
4141
TestType = 0
4242

@@ -45,4 +45,8 @@ communication.antoCompileOnly = true
4545

4646
androidAop.debugMode = true
4747
androidAop.reflectInvokeMethod = false
48-
androidAop.debugMode.variantOnlyDebug = true
48+
androidAop.debugMode.variantOnlyDebug = true
49+
50+
mavenCentralPublishing=true
51+
52+
signAllPublications=true

‎gradle/android_publish.gradle‎

Lines changed: 29 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,36 @@
1-
// Configures common publishing settings.
2-
31
apply plugin: "maven-publish"
42
apply plugin: "signing"
5-
group = rootProject.group
6-
version = rootProject.version
7-
task sourceJar(type: Jar) {
8-
if (project.hasProperty("kotlin")) {
9-
from android.sourceSets.main.java.getSrcDirs()
10-
} else if (project.hasProperty("android")) {
11-
from android.sourceSets.main.java.sourceFiles
12-
} else {
13-
from sourceSets.main.allSource
14-
}
15-
archiveClassifier = 'sources'
16-
}
17-
afterEvaluate {
18-
publishing {
19-
publications {
20-
mavenJava(MavenPublication) {
21-
artifact sourceJar
22-
artifactId = PROJ_NAME
23-
from(components.release)
24-
pom {
25-
packaging = "aar"
26-
name = PROJ_BASENAME
27-
description = PROJ_DESCRIPTION
28-
url = PROJ_WEBSITEURL
29-
licenses {
30-
license {
31-
name = 'The Apache License, Version 2.0'
32-
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
33-
}
34-
}
35-
developers {
36-
developer {
37-
id = DEVELOPER_ID
38-
name = DEVELOPER_NAME
39-
email = DEVELOPER_EMAIL
40-
}
41-
}
3+
apply plugin: "com.vanniktech.maven.publish"
4+
5+
def appVersionName = rootProject.version
6+
427

43-
scm {
44-
connection = PROJ_VCSURL
45-
developerConnection = PROJ_VCSURL
46-
url = PROJ_WEBSITEURL
47-
}
48-
}
8+
mavenPublishing {
9+
coordinates(PROJ_GROUP, PROJ_NAME, appVersionName)
10+
11+
pom {
12+
name = PROJ_BASENAME
13+
description = PROJ_DESCRIPTION
14+
inceptionYear = "2022"
15+
url = PROJ_WEBSITEURL
16+
licenses {
17+
license {
18+
name = "The Apache License, Version 2.0"
19+
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
20+
distribution = "http://www.apache.org/licenses/LICENSE-2.0.txt"
4921
}
5022
}
51-
}
52-
signing {
53-
sign publishing.publications.mavenJava
23+
developers {
24+
developer {
25+
id = DEVELOPER_ID
26+
name = DEVELOPER_NAME
27+
email = DEVELOPER_EMAIL
28+
}
29+
}
30+
scm {
31+
connection = PROJ_VCSURL
32+
developerConnection = PROJ_VCSURL
33+
url = PROJ_WEBSITEURL
34+
}
5435
}
5536
}

‎gradle/java_publish.gradle‎

Lines changed: 26 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,35 @@
11
apply plugin: "maven-publish"
22
apply plugin: "signing"
3+
apply plugin: "com.vanniktech.maven.publish"
34

4-
group = rootProject.group
5-
version = rootProject.version
5+
def appVersionName = rootProject.version
66

7-
java {
8-
withJavadocJar()
9-
withSourcesJar()
10-
}
11-
javadoc {
12-
if (JavaVersion.current().isJava9Compatible()) {
13-
options.addBooleanOption('html5', true)
14-
}
15-
}
16-
afterEvaluate {
17-
publishing {
18-
publications {
19-
mavenJava(MavenPublication) {
20-
artifactId = PROJ_NAME
21-
from(components.java)
22-
pom {
23-
packaging = "jar"
24-
name = PROJ_BASENAME
25-
description = PROJ_DESCRIPTION
26-
url = PROJ_WEBSITEURL
27-
licenses {
28-
license {
29-
name = 'The Apache License, Version 2.0'
30-
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
31-
}
32-
}
33-
developers {
34-
developer {
35-
id = DEVELOPER_ID
36-
name = DEVELOPER_NAME
37-
email = DEVELOPER_EMAIL
38-
}
39-
}
7+
mavenPublishing {
8+
coordinates(PROJ_GROUP, PROJ_NAME, appVersionName)
409

41-
scm {
42-
connection = PROJ_VCSURL
43-
developerConnection = PROJ_VCSURL
44-
url = PROJ_WEBSITEURL
45-
}
46-
}
10+
pom {
11+
name = PROJ_BASENAME
12+
description = PROJ_DESCRIPTION
13+
inceptionYear = "2022"
14+
url = PROJ_WEBSITEURL
15+
licenses {
16+
license {
17+
name = "The Apache License, Version 2.0"
18+
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
19+
distribution = "http://www.apache.org/licenses/LICENSE-2.0.txt"
4720
}
4821
}
49-
}
50-
signing {
51-
sign publishing.publications.mavenJava
22+
developers {
23+
developer {
24+
id = DEVELOPER_ID
25+
name = DEVELOPER_NAME
26+
email = DEVELOPER_EMAIL
27+
}
28+
}
29+
scm {
30+
connection = PROJ_VCSURL
31+
developerConnection = PROJ_VCSURL
32+
url = PROJ_WEBSITEURL
33+
}
5234
}
5335
}
54-

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ ksp = "1.8.10-1.0.9"
33
kotlinpoet_version = "1.15.3"
44
gradle_version = "7.4.1"
55
dom4j_version = "1.6.1"
6-
org-jetbrains-kotlin-jvm = "1.8.10"
7-
agp = "7.4.1"
8-
org-jetbrains-kotlin-android = "1.8.10"
6+
org-jetbrains-kotlin-jvm = "1.9.23"
7+
agp = "8.2.2"
8+
org-jetbrains-kotlin-android = "1.9.23"
99
core-ktx = "1.6.1"
1010
junit = "4.13.2"
1111
androidx-test-ext-junit = "1.1.5"
@@ -15,7 +15,7 @@ material = "1.6.0"
1515
gson = "2.10.1"
1616
sdkVersion = "31"
1717
minSdkVersion = "21"
18-
androidAopVersion = "2.1.4"
18+
androidAopVersion = "2.7.4"
1919
[libraries]
2020
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinpoet_version" }
2121
ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }
@@ -29,12 +29,12 @@ appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "a
2929
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
3030
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
3131
symbol-processing-gradle-plugin = { group = "com.google.devtools.ksp", name = "symbol-processing-gradle-plugin", version.ref = "ksp" }
32-
androidAop-core = { group = "io.github.FlyJingFish.AndroidAop", name = "android-aop-core" ,version.ref = "androidAopVersion" }
33-
androidAop-annotation = { group = "io.github.FlyJingFish.AndroidAop", name = "android-aop-annotation" ,version.ref = "androidAopVersion" }
34-
androidAop-ksp = { group = "io.github.FlyJingFish.AndroidAop", name = "android-aop-ksp" ,version.ref = "androidAopVersion" }
32+
androidAop-core = { group = "io.github.flyjingfish", name = "androidaop-core" ,version.ref = "androidAopVersion" }
33+
androidAop-annotation = { group = "io.github.flyjingfish", name = "androidaop-annotation" ,version.ref = "androidAopVersion" }
34+
androidAop-ksp = { group = "io.github.flyjingfish", name = "androidaop-apt" ,version.ref = "androidAopVersion" }
3535
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" ,version.ref = "org-jetbrains-kotlin-android" }
3636
[plugins]
3737
org-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "org-jetbrains-kotlin-jvm" }
3838
com-android-library = { id = "com.android.library", version.ref = "agp" }
3939
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
40-
androidAop-plugin = { id = "io.github.FlyJingFish.AndroidAop.android-aop", version.ref = "androidAopVersion" }
40+
androidAop-plugin = { id = "io.github.flyjingfish.androidaop", version.ref = "androidAopVersion" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 02 10:36:37 CST 2024
1+
#Mon Aug 01 17:29:10 CST 2022
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
34
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
5-
zipStoreBase=GRADLE_USER_HOME
65
zipStorePath=wrapper/dists
6+
zipStoreBase=GRADLE_USER_HOME

‎module-communication-annotation/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
PROJ_NAME=module-communication-annotation
1+
PROJ_NAME=modulecommunication-annotation

‎module-communication-intercept/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
PROJ_NAME=module-communication-intercept
1+
PROJ_NAME=modulecommunication-intercept

0 commit comments

Comments
 (0)