Skip to content

Commit 9a2aafe

Browse files
bratta-dkbratta-dk
committed
feat: Update all build to use publishing and versioning plugins
1 parent 3819eb2 commit 9a2aafe

File tree

11 files changed

+93
-107
lines changed

11 files changed

+93
-107
lines changed

‎README.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,28 @@ https://github.com/pedroSG94/RootEncoder/tree/master/app/src/main/java/com/pedro
180180

181181
Code example for low API devices (Android API 16+):
182182
https://github.com/pedroSG94/RootEncoder/tree/master/app/src/main/java/com/pedro/streamer/oldapi
183+
184+
## DK Release and Deploy
185+
186+
We use the [axion-release-plugin](https://axion-release-plugin.readthedocs.io/en/latest/) to help with versioning and releases.
187+
188+
Basic workflow with axion-release:
189+
```
190+
$ ./gradlew currentVersion
191+
0.1.0
192+
193+
$ git commit -m "Some commit."
194+
195+
$ ./gradlew currentVersion
196+
0.1.1-SNAPSHOT
197+
198+
// Create a new tag and push it to remote
199+
$ ./gradlew release
200+
201+
$ git tag
202+
project-0.1.0
203+
project-0.1.1
204+
205+
// Upload release to dk-maven
206+
$ ./gradlew publish
207+
```

‎app/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ android {
1111
applicationId = "com.pedro.streamer"
1212
minSdk = 16
1313
targetSdk = 36
14-
versionCode = project.version.toString().replace(".", "").toInt()
15-
versionName = project.version.toString()
1614
multiDexEnabled = true
1715
}
1816
buildTypes {

‎build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
12
allprojects {
2-
group = "com.github.pedroSG94"
3+
group = "com.github.pedroSG94.RootEncoder"
34
version = "2.6.4"
45
}
56

@@ -8,6 +9,8 @@ plugins {
89
alias(libs.plugins.android.library) apply false
910
alias(libs.plugins.jetbrains.kotlin) apply false
1011
alias(libs.plugins.jetbrains.dokka) apply true
12+
13+
id("convention.project.versioning")
1114
}
1215

1316
tasks.register("clean") {

‎common/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -31,21 +33,13 @@ android {
3133
}
3234
}
3335

34-
afterEvaluate {
35-
publishing {
36-
publications {
37-
// Creates a Maven publication called "release".
38-
create<MavenPublication>("release") {
39-
// Applies the component for the release build variant.
40-
from(components["release"])
41-
42-
// You can then customize attributes of the publication as shown below.
43-
groupId = project.group.toString()
44-
artifactId = project.name
45-
version = project.version.toString()
46-
}
47-
}
48-
}
36+
publishingConfig {
37+
groupId = group.toString()
38+
artifactId = "common"
39+
domain = "diamond-kinetics"
40+
domainOwner = "626803233223"
41+
repository = "dk-maven"
42+
region = "us-east-1"
4943
}
5044

5145
dependencies {

‎encoder/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -33,21 +35,13 @@ android {
3335
}
3436
}
3537

36-
afterEvaluate {
37-
publishing {
38-
publications {
39-
// Creates a Maven publication called "release".
40-
create<MavenPublication>("release") {
41-
// Applies the component for the release build variant.
42-
from(components["release"])
43-
44-
// You can then customize attributes of the publication as shown below.
45-
groupId = project.group.toString()
46-
artifactId = project.name
47-
version = project.version.toString()
48-
}
49-
}
50-
}
38+
publishingConfig {
39+
groupId = group.toString()
40+
artifactId = "encoder"
41+
domain = "diamond-kinetics"
42+
domainOwner = "626803233223"
43+
repository = "dk-maven"
44+
region = "us-east-1"
5145
}
5246

5347
dependencies {

‎library/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -30,21 +32,13 @@ android {
3032
}
3133
}
3234

33-
afterEvaluate {
34-
publishing {
35-
publications {
36-
// Creates a Maven publication called "release".
37-
create<MavenPublication>("release") {
38-
// Applies the component for the release build variant.
39-
from(components["release"])
40-
41-
// You can then customize attributes of the publication as shown below.
42-
groupId = project.group.toString()
43-
artifactId = project.name
44-
version = project.version.toString()
45-
}
46-
}
47-
}
35+
publishingConfig {
36+
groupId = group.toString()
37+
artifactId = "library"
38+
domain = "diamond-kinetics"
39+
domainOwner = "626803233223"
40+
repository = "dk-maven"
41+
region = "us-east-1"
4842
}
4943

5044
dependencies {

‎rtmp/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -30,21 +32,13 @@ android {
3032
}
3133
}
3234

33-
afterEvaluate {
34-
publishing {
35-
publications {
36-
// Creates a Maven publication called "release".
37-
create<MavenPublication>("release") {
38-
// Applies the component for the release build variant.
39-
from(components["release"])
40-
41-
// You can then customize attributes of the publication as shown below.
42-
groupId = project.group.toString()
43-
artifactId = project.name
44-
version = project.version.toString()
45-
}
46-
}
47-
}
35+
publishingConfig {
36+
groupId = group.toString()
37+
artifactId = "rtmp"
38+
domain = "diamond-kinetics"
39+
domainOwner = "626803233223"
40+
repository = "dk-maven"
41+
region = "us-east-1"
4842
}
4943

5044
dependencies {

‎rtsp/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -34,21 +36,13 @@ android {
3436
}
3537
}
3638

37-
afterEvaluate {
38-
publishing {
39-
publications {
40-
// Creates a Maven publication called "release".
41-
create<MavenPublication>("release") {
42-
// Applies the component for the release build variant.
43-
from(components["release"])
44-
45-
// You can then customize attributes of the publication as shown below.
46-
groupId = project.group.toString()
47-
artifactId = project.name
48-
version = project.version.toString()
49-
}
50-
}
51-
}
39+
publishingConfig {
40+
groupId = group.toString()
41+
artifactId = "rtsp"
42+
domain = "diamond-kinetics"
43+
domainOwner = "626803233223"
44+
repository = "dk-maven"
45+
region = "us-east-1"
5246
}
5347

5448
dependencies {

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pluginManagement {
2+
includeBuild("build-logic")
23
repositories {
34
google()
45
mavenCentral()

‎srt/build.gradle.kts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
alias(libs.plugins.jetbrains.kotlin)
44
alias(libs.plugins.jetbrains.dokka)
55
`maven-publish`
6+
7+
id("convention.publishing")
68
}
79

810
android {
@@ -30,21 +32,13 @@ android {
3032
}
3133
}
3234

33-
afterEvaluate {
34-
publishing {
35-
publications {
36-
// Creates a Maven publication called "release".
37-
create<MavenPublication>("release") {
38-
// Applies the component for the release build variant.
39-
from(components["release"])
40-
41-
// You can then customize attributes of the publication as shown below.
42-
groupId = project.group.toString()
43-
artifactId = project.name
44-
version = project.version.toString()
45-
}
46-
}
47-
}
35+
publishingConfig {
36+
groupId = group.toString()
37+
artifactId = "srt"
38+
domain = "diamond-kinetics"
39+
domainOwner = "626803233223"
40+
repository = "dk-maven"
41+
region = "us-east-1"
4842
}
4943

5044
dependencies {

0 commit comments

Comments
 (0)