From e71dcd3c76d36365f5f21253dbb8c540d2ef77ee Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Mon, 3 Jun 2024 13:45:30 +0200 Subject: [PATCH 1/6] Publish to maven.theoplayer.com and GitHub Packages --- .github/workflows/publish.yml | 34 ++++++++++++++++++++++++++++++++++ connectors/publish.gradle | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..42df235d --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,34 @@ +name: Publish release +on: + # Runs whenever a new release is created in GitHub + release: + types: [ created ] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + # Publish job + publish: + runs-on: ubuntu-latest + # Sets permissions of the GITHUB_TOKEN to allow publishing to GitHub Packages + permissions: + contents: read + packages: write + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + - name: Validate Gradle wrapper + uses: gradle/actions/wrapper-validation@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Publish package + run: ./gradlew publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }} + REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }} diff --git a/connectors/publish.gradle b/connectors/publish.gradle index 88e22feb..04dd82ed 100644 --- a/connectors/publish.gradle +++ b/connectors/publish.gradle @@ -19,6 +19,25 @@ tasks.register("dokkaJavadocJar", Jar) { afterEvaluate { publishing { + repositories { + maven { + name = "reposilite" + url = uri("https://reposilite.prudentgiraffe.com/releases") + credentials { + username = System.getenv("REPOSILITE_USERNAME") + password = System.getenv("REPOSILITE_PASSWORD") + } + } + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/THEOplayer/android-connector") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { release(MavenPublication) { groupId project.ext.groupId From 33411b86b55d6f4f01241cd9695a5eace6ae5549 Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Mon, 3 Jun 2024 14:01:52 +0200 Subject: [PATCH 2/6] Switch from JitPack to maven.theoplayer.com --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 4c1bc45b..4432798d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,8 +11,8 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url 'https://maven.theoplayer.com/releases/' } maven { url 'https://raw.githubusercontent.com/NielsenDigitalSDK/nielsenappsdk-android/master/'} - maven { url 'https://jitpack.io' } } } From 7446ca41e2ec5cca038fda46ddecc6bd47293b5e Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Mon, 3 Jun 2024 14:03:58 +0200 Subject: [PATCH 3/6] Update readme --- README.md | 6 +++--- connectors/analytics/nielsen/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 478f2697..0efb2b0c 100644 --- a/README.md +++ b/README.md @@ -28,18 +28,18 @@ It's not recommended to use different versions for Unified Android SDK and the C ## Installation -The THEOplayer Android SDK Connectors are available through Jitpack using the `com.theoplayer.android-connector` group which is different than the group of THEOplayer Android SDK. +The THEOplayer Android SDK Connectors are available through the [THEOplayer Maven repository](https://maven.theoplayer.com/) using the `com.theoplayer.android-connector` group which is different than the group of THEOplayer Android SDK. To set up the dependency follow these steps: -In your **project** level `build.gradle` file add the Jitpack repository: +In your **project** level `build.gradle` file add the THEOplayer Maven repository: ``` allprojects { repositories { google() mavenCentral() - maven { url 'https://jitpack.io' } + maven { url 'https://maven.theoplayer.com/releases/' } } } ``` diff --git a/connectors/analytics/nielsen/README.md b/connectors/analytics/nielsen/README.md index 30880c01..ad1070f5 100644 --- a/connectors/analytics/nielsen/README.md +++ b/connectors/analytics/nielsen/README.md @@ -23,7 +23,7 @@ Also in the `build.gradle` file, specify the Nielsen maven repository inside the ```groovy repositories { - maven { url 'https://jitpack.io' } + maven { url 'https://maven.theoplayer.com/releases/' } maven { url 'https://raw.githubusercontent.com/NielsenDigitalSDK/nielsenappsdk-android/master/'} } ``` From 365b5e3d9bc8e4880722d1ee3ec32ca13428597b Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Mon, 3 Jun 2024 14:25:01 +0200 Subject: [PATCH 4/6] Remove references to "Unified Android SDK" --- README.md | 14 +++++++------- connectors/analytics/conviva/README.md | 3 ++- connectors/analytics/nielsen/README.md | 7 ++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0efb2b0c..e6f52289 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # THEOplayer Android SDK Connectors -This repository is maintained by [THEO Technologies](https://www.theoplayer.com/) and contains the different connectors available with THEOplayer Unified Android SDK. +This repository is maintained by [THEO Technologies](https://www.theoplayer.com/) and contains the different connectors available with the THEOplayer Android SDK. -The THEOplayer Unified Android SDK enables you to quickly deliver content playback on Android, Android TV and Fire TV. +The THEOplayer Android SDK enables you to quickly deliver content playback on Android, Android TV and Fire TV. -Using the available connectors allows you to augment the features delivered through the Unified Android SDK. +Using the available connectors allows you to augment the features delivered through the Android SDK. ## Prerequisites -The THEOplayer Android SDK Connectors requires the application to import the THEOplayer Unified Android SDK since the connector relies on its public APIs. -For more details about importing THEOplayer Unified Android SDK check the [documentation](https://docs.theoplayer.com/getting-started/01-sdks/02-android-unified/00-getting-started.md). +The THEOplayer Android SDK Connectors requires the application to import the THEOplayer Android SDK since the connector relies on its public APIs. +For more details about importing THEOplayer Android SDK check the [documentation](https://www.theoplayer.com/docs/theoplayer/getting-started/sdks/android/getting-started/). ## Available Connectors @@ -23,8 +23,8 @@ For more details about importing THEOplayer Unified Android SDK check the [docum Notes: * The `+` will fetch the latest released version of THEOplayer Android SDK Connector. * Android Studio will recommend replacing the `+` with the exact version of THEOplayer Android SDK Connector. -* The THEOplayer Unified Android SDK and the THEOplayer Android SDK Connectors are stable when using the same version. -It's not recommended to use different versions for Unified Android SDK and the Connectors. +* The THEOplayer Android SDK and the THEOplayer Android SDK Connectors are stable when using the same version. + It's not recommended to use different versions for the Android SDK and the Connectors. ## Installation diff --git a/connectors/analytics/conviva/README.md b/connectors/analytics/conviva/README.md index 90b14f8b..53c36011 100644 --- a/connectors/analytics/conviva/README.md +++ b/connectors/analytics/conviva/README.md @@ -4,7 +4,8 @@ The Conviva connector provides a Conviva integration for THEOplayer Android SDK. ## Prerequisites -The THEOplayer Android SDK Conviva Connector requires the application to import the THEOplayer Android SDK (either WebView-based or Unified Android SDK) since the connector relies on its public APIs. For more details, check out our [Getting started on Unified Android](https://docs.theoplayer.com/getting-started/01-sdks/02-android-unified/00-getting-started.md) or [Getting started on Android](https://docs.theoplayer.com/getting-started/01-sdks/02-android/00-getting-started.md) guide. +The THEOplayer Android SDK Conviva Connector requires the application to import the THEOplayer Android SDK since the connector relies on its public APIs. +For more details, check out our [Getting started on Android](https://www.theoplayer.com/docs/theoplayer/getting-started/sdks/android/getting-started/) guide. For setting up a valid Conviva session, you must have access to a [Conviva developer account](https://pulse.conviva.com/) with access to a debug or production key. diff --git a/connectors/analytics/nielsen/README.md b/connectors/analytics/nielsen/README.md index ad1070f5..402c936c 100644 --- a/connectors/analytics/nielsen/README.md +++ b/connectors/analytics/nielsen/README.md @@ -4,11 +4,8 @@ The Nielsen connector provides a Nielsen integration for THEOplayer Android SDK. ## Prerequisites -The THEOplayer Android SDK Nielsen Connector requires the application to import the -THEOplayer Android SDK (either WebView-based or Unified Android SDK) since the connector relies on -its public APIs. For more details, check out our -[Getting started on Unified Android](https://docs.theoplayer.com/getting-started/01-sdks/02-android-unified/00-getting-started.md) -or [Getting started on Android](https://docs.theoplayer.com/getting-started/01-sdks/02-android/00-getting-started.md) guide. +The THEOplayer Android SDK Nielsen Connector requires the application to import the THEOplayer Android SDK since the connector relies on its public APIs. +For more details, check out our [Getting started on Android](https://www.theoplayer.com/docs/theoplayer/getting-started/sdks/android/getting-started/) guide. ## Installation After setting up the THEOplayer Android SDK, in your **module** level `build.gradle` file add the THEOplayer From a42d1f7b62647da9c14142ccea6d6b504f84aab7 Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Mon, 3 Jun 2024 14:32:18 +0200 Subject: [PATCH 5/6] Publish on new tag --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 42df235d..5003a6f6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,8 +1,9 @@ name: Publish release on: - # Runs whenever a new release is created in GitHub - release: - types: [ created ] + # Runs whenever a new tag is pushed + push: + tags: + - '*.*.*' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 28c61d8bfbd5cdb947134e52fc92c10a3a885714 Mon Sep 17 00:00:00 2001 From: Mattias Buelens Date: Wed, 5 Jun 2024 14:57:18 +0200 Subject: [PATCH 6/6] Update publish URL to maven.theoplayer.com --- connectors/publish.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/publish.gradle b/connectors/publish.gradle index 04dd82ed..27acca64 100644 --- a/connectors/publish.gradle +++ b/connectors/publish.gradle @@ -22,7 +22,7 @@ afterEvaluate { repositories { maven { name = "reposilite" - url = uri("https://reposilite.prudentgiraffe.com/releases") + url = uri("https://maven.theoplayer.com/releases") credentials { username = System.getenv("REPOSILITE_USERNAME") password = System.getenv("REPOSILITE_PASSWORD")