From dc56feb16a2f8d267d24558e29b0f318872e600f Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Fri, 2 Aug 2024 10:54:48 -0700 Subject: [PATCH 01/11] off that tag --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 7a40028..75245e9 100644 --- a/build.gradle +++ b/build.gradle @@ -9,3 +9,5 @@ plugins { 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 } + +// a comment From 50c362921f3f552fe02f98290403e88eb5fd82d4 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Fri, 2 Aug 2024 11:50:03 -0700 Subject: [PATCH 02/11] make a commit --- library/src/main/java/com/mux/video/upload/api/UploadStatus.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt index d4df0a5..819665e 100644 --- a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt +++ b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt @@ -3,6 +3,8 @@ package com.mux.video.upload.api /** * The current state of the upload. Uploads are first examined, potentially processed, then uploaded * to Mux Video. + * + * some text added here TODO remove */ sealed class UploadStatus { From 9486ceed56bec6d58b63bcecfe5eb4955e96edbe Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Fri, 2 Aug 2024 11:54:39 -0700 Subject: [PATCH 03/11] new commit for possible hook --- library/src/main/java/com/mux/video/upload/api/UploadStatus.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt index 819665e..5cec4c4 100644 --- a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt +++ b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt @@ -5,6 +5,7 @@ package com.mux.video.upload.api * to Mux Video. * * some text added here TODO remove + * TODO remove this too */ sealed class UploadStatus { From 95391ffc38661d7549a8c7375caff8686b3b05a6 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Wed, 14 Aug 2024 16:01:05 -0700 Subject: [PATCH 04/11] Required for new versioning and deployment --- build.gradle | 2 +- library/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 75245e9..b4abb5f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +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.0' apply false } // a comment diff --git a/library/build.gradle b/library/build.gradle index 127e217..f1c0c63 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -36,7 +36,7 @@ muxDistribution { releaseVersion versionFromTag() artifactIds just("upload") groupIds just("com.mux.video") - publicReleaseIf releaseOnTag() + publicReleaseIf releaseIfCmdFlag("publicRelease") packageJavadocs = true packageSources = true From 747bba58d9a3381da91edae3c1a11ccf1fc6877a Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Thu, 15 Aug 2024 09:06:40 -0700 Subject: [PATCH 05/11] trying that --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index f1c0c63..ec6901a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -34,7 +34,7 @@ android { muxDistribution { devVersion versionFromCommitHash('dev-') releaseVersion versionFromTag() - artifactIds just("upload") + artifactIds artifactFromFirstFlavor() groupIds just("com.mux.video") publicReleaseIf releaseIfCmdFlag("publicRelease") From 7272478702b64d85da4b2f86ad0408c9d09fb767 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Thu, 15 Aug 2024 09:07:58 -0700 Subject: [PATCH 06/11] Revert "trying that" This reverts commit 747bba58d9a3381da91edae3c1a11ccf1fc6877a. --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index ec6901a..f1c0c63 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -34,7 +34,7 @@ android { muxDistribution { devVersion versionFromCommitHash('dev-') releaseVersion versionFromTag() - artifactIds artifactFromFirstFlavor() + artifactIds just("upload") groupIds just("com.mux.video") publicReleaseIf releaseIfCmdFlag("publicRelease") From 50106bcd7ad636b0e457bc78708df94e0558d761 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Thu, 15 Aug 2024 16:42:10 -0700 Subject: [PATCH 07/11] we need 1.2.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b4abb5f..0007708 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +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.2.0' apply false + id 'com.mux.gradle.android.mux-android-distribution' version '1.2.1' apply false } // a comment From c7f4c21f507031c2404219452a0874f5754f2f92 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Tue, 20 Aug 2024 09:05:13 -0700 Subject: [PATCH 08/11] ignore devdocs-site --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8b5f540..de96615 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ .externalNativeBuild .cxx local.properties +devdocs-site +devdocs-site-release From 0b940cd5dcd68deca099728b5357bfcb5d1637ea Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Tue, 20 Aug 2024 15:04:05 -0700 Subject: [PATCH 09/11] While we're in here, do some maint --- gradle.properties | 1 - library/build.gradle | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a2e90d8..f19c7b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index f1c0c63..6944985 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -29,6 +29,9 @@ android { kotlinOptions { jvmTarget = '1.8' } + buildFeatures { + buildConfig true + } } muxDistribution { From 0b994881c1553ffad88369af0dfb2ad6198a2e87 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Tue, 20 Aug 2024 15:07:01 -0700 Subject: [PATCH 10/11] Cleanup --- .../com/mux/video/vod/demo/upload/screen/CreateUploadScreen.kt | 2 -- library/src/main/java/com/mux/video/upload/api/UploadStatus.kt | 3 --- 2 files changed, 5 deletions(-) diff --git a/app/src/main/java/com/mux/video/vod/demo/upload/screen/CreateUploadScreen.kt b/app/src/main/java/com/mux/video/vod/demo/upload/screen/CreateUploadScreen.kt index c3709ac..5c83105 100644 --- a/app/src/main/java/com/mux/video/vod/demo/upload/screen/CreateUploadScreen.kt +++ b/app/src/main/java/com/mux/video/vod/demo/upload/screen/CreateUploadScreen.kt @@ -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 diff --git a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt index 5cec4c4..d4df0a5 100644 --- a/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt +++ b/library/src/main/java/com/mux/video/upload/api/UploadStatus.kt @@ -3,9 +3,6 @@ package com.mux.video.upload.api /** * The current state of the upload. Uploads are first examined, potentially processed, then uploaded * to Mux Video. - * - * some text added here TODO remove - * TODO remove this too */ sealed class UploadStatus { From 8b8534e264a842270b4182b8b26808d8978b9193 Mon Sep 17 00:00:00 2001 From: Emily Dixon Date: Tue, 20 Aug 2024 15:10:19 -0700 Subject: [PATCH 11/11] Remove GHA workflows for CI/CD & deployment --- .github/workflows/android-cicd.yml | 52 ---------------- .../workflows/artifactory-deploy-from-tag.yml | 34 ----------- .github/workflows/dokka-on-release.yml | 59 ------------------- 3 files changed, 145 deletions(-) delete mode 100644 .github/workflows/android-cicd.yml delete mode 100644 .github/workflows/artifactory-deploy-from-tag.yml delete mode 100644 .github/workflows/dokka-on-release.yml diff --git a/.github/workflows/android-cicd.yml b/.github/workflows/android-cicd.yml deleted file mode 100644 index eb2a8c1..0000000 --- a/.github/workflows/android-cicd.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Build and Verify -# Builds, tests, and publishes dev builds of Android SDKs. The CD destination and CI configuration are handled by your gradle files. You only invoke tasks here -# ** Building multiple modules? If one depends on another, you'll have to build the dependencies in one step and the rest in another. -# See below for more info -# REPOSITORY SECRETS REQUIRED: (see https://docs.github.com/en/actions/security-guides/encrypted-secrets) -# "ARTIFACTORY_EMAIL": an artifactory account email with publish permissions for the destination artifactory -# "ARTIFACTORY_PASSWORD": the password for the artifactory account - -on: - push: - -jobs: - build-aars: - name: Build & Publish Dev Artifacts - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - # This step will build all modules configured for publication and publish them - # Does your project publish multiple libraries in a dependency chain? You'll have to add another copy of this step and build the dependency in the first one - - name: Build and Publish to Dev Repo - uses: gradle/gradle-build-action@v3.1.0 - with: - arguments: artifactoryPublish - env: - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_EMAIL }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }} - GH_USER: ${{ github.actor }} - TOKEN: ${{ secrets.GITHUB_TOKEN }} - - unit-tests: - name: Run Unit Tests - runs-on: ubuntu-latest - needs: build-aars - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - name: Unit Tests - uses: gradle/gradle-build-action@v3.1.0 - with: - arguments: test - diff --git a/.github/workflows/artifactory-deploy-from-tag.yml b/.github/workflows/artifactory-deploy-from-tag.yml deleted file mode 100644 index c96abd6..0000000 --- a/.github/workflows/artifactory-deploy-from-tag.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Deploy to Release Repo -# Builds, tests, and publishes dev builds of Android SDKs. The CD destination and CI configuration are handled by your gradle files. You only invoke tasks here -# ** Building multiple modules? If one depends on another, you'll have to build the dependencies in one step and the rest in another. -# See below for more info -# REPOSITORY SECRETS REQUIRED: (see https://docs.github.com/en/actions/security-guides/encrypted-secrets) -# "ARTIFACTORY_EMAIL": an artifactory account email with publish permissions for the destination artifactory -# "ARTIFACTORY_PASSWORD": the password for the artifactory account - -on: - release: - types: - - published - -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - # This step will build all modules configured for publication and publish them - # Does your project publish multiple libraries in a dependency chain? You'll have to add another copy of this step and build the dependency in the first one - - name: Deploy to Release Repo - uses: gradle/gradle-build-action@v3.1.0 - with: - arguments: artifactoryPublish - env: - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_EMAIL }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }} diff --git a/.github/workflows/dokka-on-release.yml b/.github/workflows/dokka-on-release.yml deleted file mode 100644 index b6fc47d..0000000 --- a/.github/workflows/dokka-on-release.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Workflow for updating devdocs.mux.com with new documentation every time a new version is released -# -# Ths workflow assumes your releases are tagged either "vX.X.X" or "X.X.X", where X is a number of any length -# -# REQUIRED SECRETS: -# AWS_DOCS_KEY -# AWS_DOCS_SECRET -# DOCS_REPO_PAT -# REQUIRED CONFIGURATION: -# You have to change 'upload-android' to match a URL slug for your docs, like 'upload-android' or 'data-exoplayer' -# You have to supply the path to your dokka output. The default is library/build/dokka/html -# You may need to change the name of the Gradle task used for generating your Dokka docs -name: Upload Dokka DevDocs - -on: - release: - types: - - published - -jobs: - devdocs: - runs-on: ubuntu-latest - name: Generate and Upload Dokka Docs - - env: - AWS_EC2_METADATA_DISABLED: true - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - name: Parse the version out of the tag name - id: version - run: > - echo "version_name="$(echo ${{ github.event.release.tag_name }} | sed -E "s/^v//")"" >> $GITHUB_OUTPUT - - name: Configure AWS - run: > - aws configure set aws_access_key_id ${{ secrets.AWS_DOCS_KEY }}; - aws configure set aws_secret_access_key ${{ secrets.AWS_DOCS_SECRET }} - - # If you have a multi-module project or monorepo, you'll need to repeat these steps - # POSSIBLE CONFIGURATION: make sure the `arguments:` tag matches the correct task(s) for your project - - name: Build Dokka Docs - uses: gradle/gradle-build-action@v3.1.0 - with: - arguments: ':library:dokkaHtml' - # REQUIRED CONFIGURATION: You have to change upload-android to a suitable URL slug for your project - - name: Update the docs AWS bucket - run: | - aws s3 rm --recursive "s3://mux-devdocs/upload-android/latest/" - aws s3 sync library/build/dokka/html s3://mux-devdocs/upload-android/${{ steps.version.outputs.version_name }}/ - aws s3 sync library/build/dokka/html s3://mux-devdocs/upload-android/latest/ - - name: Update the devdocs site - run: | - echo "${{ secrets.DOCS_REPO_PAT }}" | gh auth login --with-token - gh workflow run -R muxinc/devdocs-directory deploy-to-s3