Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Distribution Plugin + configure to use the new Buildkite #143

Merged
merged 11 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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