Skip to content

Commit

Permalink
Releases/v0.4.0
Browse files Browse the repository at this point in the history
## Improvements

* Update to Core 8.1.0 (#32)



Co-authored-by: Emily Dixon <[email protected]>
Co-authored-by: GitHub <[email protected]>
  • Loading branch information
daytime-em and web-flow authored Sep 17, 2024
1 parent 1a7d875 commit 4394caa
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 290 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.

82 changes: 0 additions & 82 deletions .github/workflows/saucelabs-tests-push.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/saucelabs-tests-release.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
/captures
.externalNativeBuild

app/buildout/**
automatedtests/buildout/**
muxstatssdktheoplayer/buildout/**
app/build/**
automatedtests/build/**
muxstatssdktheoplayer/build/**
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (propertiesFile.exists()) {
}

android {
compileSdkVersion project.ext.compileSdkVersion
compileSdk project.ext.compileSdkVersion

defaultConfig {
applicationId "com.mux.stats.sdk.muxstats.theoplayer"
Expand Down Expand Up @@ -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}"
Expand Down
13 changes: 7 additions & 6 deletions automatedtests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
}
10 changes: 3 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
Expand All @@ -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"
}
}
Expand Down Expand Up @@ -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"
}
}

Expand Down
7 changes: 3 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
Loading

0 comments on commit 4394caa

Please sign in to comment.