-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from bitmovin/feature/modules
Feature/modules
- Loading branch information
Showing
32 changed files
with
2,844 additions
and
308 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| apply plugin: 'com.android.library' | ||
| apply plugin: 'com.jfrog.artifactory' | ||
| apply plugin: 'maven-publish' | ||
|
|
||
| def packageName = 'com.bitmovin.analytics-bitmovin-player' | ||
| def libraryVersion = '1.4.0' | ||
|
|
||
| android { | ||
|
|
||
| compileSdkVersion 27 | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion 16 | ||
| targetSdkVersion 27 | ||
| versionCode 13 | ||
| versionName "1.4.0" | ||
|
|
||
| testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | ||
|
|
||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation fileTree(dir: 'libs', include: ['*.jar']) | ||
|
|
||
| implementation 'com.android.support:appcompat-v7:27.0.0' | ||
| testImplementation 'junit:junit:4.12' | ||
| androidTestImplementation 'com.android.support.test:runner:1.0.1' | ||
| androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' | ||
|
|
||
| implementation project(path: ':collector') | ||
| implementation 'com.bitmovin.player:playercore:2.13.0' | ||
|
|
||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| aar(MavenPublication) { | ||
| groupId packageName | ||
| version = libraryVersion | ||
| artifactId project.getName() | ||
|
|
||
| // Tell maven to prepare the generated "*.aar" file for publishing | ||
| artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") | ||
|
|
||
| pom.withXml { | ||
| def dependenciesNode = asNode().appendNode('dependencies') | ||
|
|
||
| //Defining configuration names from which dependencies will be taken (debugCompile or releaseCompile and compile) | ||
| def configurationNames = ['compile'] | ||
|
|
||
| configurationNames.each { configurationName -> | ||
| configurations[configurationName].allDependencies.each { | ||
| def dependencyNode = dependenciesNode.appendNode('dependency') | ||
| dependencyNode.appendNode('groupId', it.group) | ||
| dependencyNode.appendNode('artifactId', it.name) | ||
| dependencyNode.appendNode('version', it.version) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| artifactory { | ||
| contextUrl = 'https://bitmovin.jfrog.io/bitmovin' | ||
| publish { | ||
| repository { | ||
| // The Artifactory repository key to publish to | ||
| repoKey = libraryVersion.endsWith('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local' | ||
| } | ||
| defaults { | ||
| // Tell the Artifactory Plugin which artifacts should be published to Artifactory. | ||
| publications('aar') | ||
| publishArtifacts = true | ||
| username = "${artifactory_user}" | ||
| password = "${artifactory_password}" | ||
|
|
||
| // Properties to be attached to the published artifacts. | ||
| properties = ['qa.level': 'basic', 'dev.team': 'core'] | ||
| // Publish generated POM files to Artifactory (true by default) | ||
| publishPom = true | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Add project specific ProGuard rules here. | ||
| # You can control the set of applied configuration files using the | ||
| # proguardFiles setting in build.gradle. | ||
| # | ||
| # For more details, see | ||
| # http://developer.android.com/guide/developing/tools/proguard.html | ||
|
|
||
| # If your project uses WebView with JS, uncomment the following | ||
| # and specify the fully qualified class name to the JavaScript interface | ||
| # class: | ||
| #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
| # public *; | ||
| #} | ||
|
|
||
| # Uncomment this to preserve the line number information for | ||
| # debugging stack traces. | ||
| #-keepattributes SourceFile,LineNumberTable | ||
|
|
||
| # If you keep the line number information, uncomment this to | ||
| # hide the original source file name. | ||
| #-renamesourcefileattribute SourceFile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <manifest package="com.bitmovin.analytics.bitmovin.player" /> |
25 changes: 25 additions & 0 deletions
25
...-player/src/main/java/com/bitmovin/analytics/bitmovin/player/BitmovinPlayerCollector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.bitmovin.analytics.bitmovin.player; | ||
|
|
||
| import com.bitmovin.analytics.BitmovinAnalytics; | ||
| import com.bitmovin.analytics.BitmovinAnalyticsConfig; | ||
| import com.bitmovin.player.BitmovinPlayer; | ||
|
|
||
| public class BitmovinPlayerCollector extends BitmovinAnalytics { | ||
|
|
||
| /** | ||
| * Bitmovin Analytics | ||
| * | ||
| * @param bitmovinAnalyticsConfig {@link BitmovinAnalyticsConfig} | ||
| */ | ||
| public BitmovinPlayerCollector( | ||
| BitmovinAnalyticsConfig bitmovinAnalyticsConfig) { | ||
| super(bitmovinAnalyticsConfig); | ||
| } | ||
|
|
||
| public void attachPlayer(BitmovinPlayer player) { | ||
| BitmovinSdkAdapter adapter = new BitmovinSdkAdapter(player, this.bitmovinAnalyticsConfig, | ||
| this.playerStateMachine); | ||
|
|
||
| this.attach(adapter); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
Oops, something went wrong.