diff --git a/.github/workflows/android-cicd.yml b/.github/workflows/android-cicd.yml deleted file mode 100644 index 2bff468..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: '11' - 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@v2.3.3 - 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: '11' - distribution: 'temurin' - - name: Unit Tests - uses: gradle/gradle-build-action@v2.3.3 - 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 c7bd23c..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: '11' - 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@v2.3.3 - 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/saucelabs-tests-push.yml b/.github/workflows/saucelabs-tests-push.yml deleted file mode 100644 index 069a680..0000000 --- a/.github/workflows/saucelabs-tests-push.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Test with Sauce Labs (Only Latest) - -# TODO: Doesn't run when it's supposed to (but both sauce w/f test the same thing atm so -# TODO(Continued): come back to this later -on: - workflow_dispatch: -# push: - #branches: - # - '!releases/**' - # - '!master' - -env: - SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}} - SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}} - -concurrency: - group: sauce-labs - cancel-in-progress: true - -jobs: - build: - name: Build Test APKs - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - name: Build automated tests - uses: gradle/gradle-build-action@v2.3.3 - with: - arguments: automatedtests:assembleV5Debug :automatedtests:assembleV5DebugAndroidTest - - name: Upload Test APKs - uses: actions/upload-artifact@v3 - with: - name: automated-test-apks - path: | - automatedtests/buildout/outputs/apk/androidTest/**/*.apk - automatedtests/buildout/outputs/apk/*/debug/automatedtests-*-debug.apk - - test-18: - name: Run Sauce Labs Tests - runs-on: ubuntu-latest - needs: build - - strategy: - max-parallel: 2 - matrix: - player_version: [ 'v7' ] - - env: - app_artifact: automatedtests\/buildout\/outputs\/apk\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug.apk - test_artifact: automatedtests\/buildout\/outputs\/apk\/androidTest\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug-androidTest.apk - app_apk: ${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug.apk - test_apk: androidTest\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug-androidTest.apk - - steps: - - uses: actions/checkout@v3 - - name: Download Test APKS - uses: actions/download-artifact@v3 - with: - name: automated-test-apks - - name: Build sauce config file - run: | - sed -E \ - -e 's/BUILD_LABEL/${{ matrix.player_version }}/g' \ - -e 's/APP_APK/${{ env.app_apk }}/g' \ - -e 's/TEST_APK/${{ env.test_apk }}/g' \ - .sauce/template.yml > .sauce/conf.yml - - name: Dump Generated Sauce Conf - run: cat .sauce/conf.yml - - name: Run Saucelabs Test (2.18.1) - uses: saucelabs/saucectl-run-action@v3 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - sauce-username: ${{ secrets.SAUCE_USERNAME }} - sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }} - config-file: .sauce/conf.yml diff --git a/.github/workflows/saucelabs-tests-release.yml b/.github/workflows/saucelabs-tests-release.yml deleted file mode 100644 index 550fd28..0000000 --- a/.github/workflows/saucelabs-tests-release.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Test with Sauce Labs (All Versions) - -on: - push: -# branches: -# - 'releases/**' -# - 'master' - -env: - SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}} - SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}} - MUX_DATA_KEY: ${{ secrets.MUX_DATA_ENV }} - THEOPLAYER_LICENSE: ${{ secrets.THEO_LICENSE }} - -concurrency: - group: sauce-labs - cancel-in-progress: true - -jobs: - build: - name: Build Test APKs - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - name: Build automated tests - uses: gradle/gradle-build-action@v2.3.3 - with: - arguments: automatedtests:assembleDebug automatedtests:assembleAndroidTest - - name: Upload Test APKs - uses: actions/upload-artifact@v3 - with: - name: automated-test-apks - path: | - automatedtests/buildout/outputs/apk/androidTest/**/*.apk - automatedtests/buildout/outputs/apk/*/debug/automatedtests-*-debug.apk - - test: - name: Run Sauce Labs Tests - runs-on: ubuntu-latest - needs: build - - strategy: - max-parallel: 1 - matrix: - # only run v7 for now, the v2 versions are very old - player_version: [ 'v7' ] - - env: - app_artifact: automatedtests\/buildout\/outputs\/apk\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug.apk - test_artifact: automatedtests\/buildout\/outputs\/apk\/androidTest\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug-androidTest.apk - app_apk: ${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug.apk - test_apk: androidTest\/${{ matrix.player_version }}\/debug\/automatedtests-${{ matrix.player_version }}-debug-androidTest.apk - - steps: - - uses: actions/checkout@v3 - - name: Download Test APKS - uses: actions/download-artifact@v3 - with: - name: automated-test-apks - - name: Build sauce config file - run: | - sed -E \ - -e 's/BUILD_LABEL/${{ matrix.player_version }}/g' \ - -e 's/APP_APK/${{ env.app_apk }}/g' \ - -e 's/TEST_APK/${{ env.test_apk }}/g' \ - .sauce/template.yml > .sauce/conf.yml - - name: Dump Generated Sauce Conf - run: cat .sauce/conf.yml - - name: Run Saucelabs Test - uses: saucelabs/saucectl-run-action@v3 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - sauce-username: ${{ secrets.SAUCE_USERNAME }} - sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }} - config-file: .sauce/conf.yml diff --git a/.gitignore b/.gitignore index cee8417..c7b42e3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,6 @@ /captures .externalNativeBuild -app/buildout/** -automatedtests/buildout/** -muxstatssdktheoplayer/buildout/** +app/build/** +automatedtests/build/** +muxstatssdktheoplayer/build/** diff --git a/app/build.gradle b/app/build.gradle index 3604175..aaf50ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ if (propertiesFile.exists()) { } android { - compileSdkVersion project.ext.compileSdkVersion + compileSdk project.ext.compileSdkVersion defaultConfig { applicationId "com.mux.stats.sdk.muxstats.theoplayer" @@ -64,7 +64,7 @@ dependencies { implementation "com.android.support:multidex:1.0.3" implementation "com.google.android.material:material:1.12.0" api "org.checkerframework:checker-qual:3.33.0" - implementation project(":muxstatssdktheoplayer") + implementation project(':library') // Test against a specific version for consistent tests implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${project.ext.theoplayerVersion}" diff --git a/automatedtests/build.gradle b/automatedtests/build.gradle index 5b4d4bf..4c42382 100644 --- a/automatedtests/build.gradle +++ b/automatedtests/build.gradle @@ -2,7 +2,7 @@ apply plugin: "com.android.application" android { - compileSdkVersion project.ext.compileSdkVersion + compileSdk project.ext.compileSdkVersion defaultConfig { namespace "com.mux.stats.sdk.muxstats.automatedtests" @@ -17,15 +17,16 @@ android { buildConfigField("boolean", "SHOULD_REPORT_INSTRUMENTATION_TEST_EVENTS_TO_SERVER", "true") var theoLicense = System.getenv("THEOPLAYER_LICENSE") == null ? "NOT_CONFIGURED" : System.getenv("THEOPLAYER_LICENSE") -// println(">>>>> THEO LICENSE USED IS ${theoLicense.take(50)}...${theoLicense.takeRight(50)}") -// theoLicense = "sZP7IYe6T6fzTu5cISAg0mkK0lBkFSaZ0lC-ClXKIOzLClPgCohiClUKCL06FOPlUY3zWokgbgjNIOf9flCkISai0oBcFSac0LR-3uIK0Ok13lfkFSP63KXl0of_CShZTmfVfK4_bQgZCYxNWoryIQXzImf90SbZ3lho3Lfi0u5i0Oi6Io4pIYP1UQgqWgjeCYxgflEc3leL3u0z0Shz0LCcFOPeWok1dDrLYtA1Ioh6TgV6v6fVfKcqCoXVdQjLUOfVfGxEIDjiWQXrIYfpCoj-fgzVfKxqWDXNWG3ybojkbK3gflNWf6E6FOPVWo31WQ1qbta6FOPzdQ4qbQc1sD4ZFK3qWmPUFOPLIQ-LflNWfKXpIwPqdDa6Ymi6bo4pIXjNWYAZIY3LdDjpflNzbG4gFOPKIDXzUYPgbZf9Dkkj" - println(">>>>> THEO LICENSE USED IS ${theoLicense.take(50)}...${theoLicense.takeRight(50)}") manifestPlaceholders.theoLicense = theoLicense var muxDataKey = System.getenv("MUX_DATA_KEY") == null ? "NOT_CONFIGURED" : System.getenv("MUX_DATA_KEY") manifestPlaceholders.muxDataKey = muxDataKey buildConfigField("String", "INSTRUMENTATION_TEST_ENVIRONMENT_KEY", "\"$muxDataKey\"") } + buildFeatures { + buildConfig true + } + buildTypes { release { minifyEnabled false @@ -96,8 +97,8 @@ dependencies { // Optional -- UI testing with UI Automator androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" androidTestImplementation "androidx.test.ext:junit:1.1.5" + implementation project(':library') - implementation project(":muxstatssdktheoplayer") - implementation "com.google.android.gms:play-services-auth:21.1.1" + implementation "com.google.android.gms:play-services-auth:21.1.1" implementation "com.google.android.gms:play-services-ads-identifier:18.0.1" } diff --git a/build.gradle b/build.gradle index 21fb74e..ef0467a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { google() @@ -7,11 +6,8 @@ buildscript { maven { url 'https://muxinc.jfrog.io/artifactory/default-maven-release-local' } } dependencies { - classpath 'com.github.kezong:fat-aar:1.3.6' - classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.novoda:bintray-release:0.9.1' - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4+" - classpath 'com.mux.gradle.android:mux-android-distribution:1.0.3' + classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.mux.gradle.android:mux-android-distribution:1.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24" } } @@ -41,7 +37,7 @@ allprojects { releaseWebsite = 'https://github.com/muxinc/mux-stats-sdk-theoplayer-android' theoplayerVersion = "7.2.0" - muxCoreVersion = "8.0.2" + muxCoreVersion = "8.1.0" } } diff --git a/gradle.properties b/gradle.properties index f662b4e..3dfd161 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,7 @@ ## Project-wide Gradle settings. -buildDir=buildout -# em - Why are we disabling desugar? -android.enableDexingArtifactTransform.desugaring=false -android.enableDexingArtifactTransform=false +buildDir=build android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx4096m +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c2b89b3..975fe06 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed May 08 11:01:50 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/muxstatssdktheoplayer/.gitignore b/library/.gitignore similarity index 100% rename from muxstatssdktheoplayer/.gitignore rename to library/.gitignore diff --git a/muxstatssdktheoplayer/build.gradle b/library/build.gradle similarity index 72% rename from muxstatssdktheoplayer/build.gradle rename to library/build.gradle index a63ad7f..64d2a90 100644 --- a/muxstatssdktheoplayer/build.gradle +++ b/library/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'signing' apply plugin: 'com.mux.gradle.android.mux-android-distribution' android { - compileSdkVersion project.ext.compileSdkVersion + compileSdk project.ext.compileSdkVersion defaultConfig { minSdkVersion project.ext.minSdkVersion @@ -19,6 +19,9 @@ android { testInstrumentationRunner "androidx.support.test.runner.AndroidJUnitRunner" } + buildFeatures { + buildConfig true + } buildTypes { debug { @@ -36,10 +39,6 @@ android { dimension 'api' minSdkVersion 21 } - v5 { - dimension 'api' - minSdkVersion 21 - } } compileOptions { @@ -58,10 +57,16 @@ muxDistribution { artifactIds artifactFromFlavorValue('api') groupIds just("com.mux.stats.sdk.muxstats") publishIf { it.containsIgnoreCase("release") } - publicReleaseIf releaseOnTag() + publicReleaseIf releaseIfCmdFlag("publicRelease") + + dokkaConfig { + moduleName = "Mux Data SDK for THEOplayer" + footer = "(c) " + new Date().format("yyyy") + " Mux, Inc. Have questions or need help?" + + " Contact support@mux.com" + } // TODO: This is kinda clumsy, packageJavadocs should be a function not a property probably - packageJavadocs = releaseOnTag().call() + packageJavadocs = releaseIfCmdFlag("publicRelease").call() artifactoryConfig { contextUrl = "https://muxinc.jfrog.io/artifactory/" releaseRepoKey = 'default-maven-release-local' @@ -75,15 +80,6 @@ dependencies { v7Api "com.theoplayer.theoplayer-sdk-android:core:${project.ext.theoplayerVersion}" v7Api "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${project.ext.theoplayerVersion}" - //noinspection GradleDependency // Old kotlin asked for by name in docs - v5Api "com.theoplayer.theoplayer-sdk-android:core:5.9.1" - //noinspection GradleDependency // Old kotlin asked for by name in docs - v5Api "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:5.9.1" - //noinspection GradleDependency,GradleDynamicVersion // Old kotlin asked for by name in docs - v5Api 'org.jetbrains.kotlin:kotlin-stdlib:1.6.+' - -// compileOnly 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' -// compileOnly 'com.google.android.gms:play-services-ads-identifier:18.0.1' testImplementation 'junit:junit:4.13.2' api "com.mux:stats.muxcore:${project.ext.muxCoreVersion}" diff --git a/muxstatssdktheoplayer/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi16-release.aar b/library/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi16-release.aar similarity index 100% rename from muxstatssdktheoplayer/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi16-release.aar rename to library/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi16-release.aar diff --git a/muxstatssdktheoplayer/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi21-release.aar b/library/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi21-release.aar similarity index 100% rename from muxstatssdktheoplayer/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi21-release.aar rename to library/libs/theoplayer-android-dist-56d3a9e5-4252-4bca-b650-180c8f16ce52-2.80.0-minapi21-release.aar diff --git a/muxstatssdktheoplayer/proguard-rules.pro b/library/proguard-rules.pro similarity index 100% rename from muxstatssdktheoplayer/proguard-rules.pro rename to library/proguard-rules.pro diff --git a/muxstatssdktheoplayer/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml similarity index 100% rename from muxstatssdktheoplayer/src/main/AndroidManifest.xml rename to library/src/main/AndroidManifest.xml diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxBaseSDKTheoPlayer.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxBaseSDKTheoPlayer.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxBaseSDKTheoPlayer.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxBaseSDKTheoPlayer.java diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxNetworkRequests.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxNetworkRequests.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxNetworkRequests.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxNetworkRequests.java diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxStatsSDKTHEOPlayer.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxStatsSDKTHEOPlayer.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxStatsSDKTHEOPlayer.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/MuxStatsSDKTHEOPlayer.java diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/Util.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/Util.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/Util.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/Util.java diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompat.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompat.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompat.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompat.java diff --git a/muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompatHoneycomb.java b/library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompatHoneycomb.java similarity index 100% rename from muxstatssdktheoplayer/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompatHoneycomb.java rename to library/src/main/java/com/mux/stats/sdk/muxstats/theoplayer/compat/AsyncTaskCompatHoneycomb.java diff --git a/settings.gradle b/settings.gradle index 0b2f58b..264df04 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -include ':app', ':muxstatssdktheoplayer', 'automatedtests' +include ':app', ':library', 'automatedtests' rootProject.name = 'mux-stats-sdk-theoplayer'