Skip to content

Commit

Permalink
Update Distribution Plugin + configure to use the new Buildkite (#143)
Browse files Browse the repository at this point in the history
* off that tag

* make a commit

* new commit for possible hook

* Required for new versioning and deployment

* trying that

* Revert "trying that"

This reverts commit 747bba5.

* we need 1.2.1

* ignore devdocs-site

* While we're in here, do some maint

* Cleanup

* Remove GHA workflows for CI/CD & deployment
  • Loading branch information
daytime-em authored Aug 20, 2024
1 parent 1fb2d37 commit d80c77b
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 150 deletions.
52 changes: 0 additions & 52 deletions .github/workflows/android-cicd.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/artifactory-deploy-from-tag.yml

This file was deleted.

59 changes: 0 additions & 59 deletions .github/workflows/dokka-on-release.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
.externalNativeBuild
.cxx
local.properties
devdocs-site
devdocs-site-release
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ private fun BodyContent(
thumbnail = state.thumbnail,
modifier = Modifier.padding(start = 20.dp, end = 20.dp)
)
//Spacer(modifier = Modifier.fillMaxHeight())
// TODO: Button
DefaultButton(
onClick = startUpload,
modifier = Modifier
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ plugins {
id 'com.android.application' version '8.4.2' apply false
id 'com.android.library' version '8.4.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
id 'com.mux.gradle.android.mux-android-distribution' version '1.1.2' apply false
id 'com.mux.gradle.android.mux-android-distribution' version '1.2.1' apply false
}

// a comment
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
5 changes: 4 additions & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
buildConfig true
}
}

muxDistribution {
devVersion versionFromCommitHash('dev-')
releaseVersion versionFromTag()
artifactIds just("upload")
groupIds just("com.mux.video")
publicReleaseIf releaseOnTag()
publicReleaseIf releaseIfCmdFlag("publicRelease")

packageJavadocs = true
packageSources = true
Expand Down

0 comments on commit d80c77b

Please sign in to comment.