Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/0.27.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Video Players committed Aug 14, 2019
2 parents 0f662b5 + bde4c15 commit 11c0af4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

### Dependencies

Clappr is a Kotlin library. If your app is too, be sure Kotlin version is `1.2.71` or bigger, and Android Support version is `28.0.0` or bigger.
Clappr is a Kotlin library. If your app is too, be sure Kotlin version is `1.3.41` or bigger, and Android Support version is `28.0.0` or bigger.

The minimal API level supported is `16` `(4.1)`.

Expand All @@ -36,7 +36,7 @@ After cloning Clappr project, add following lines to `dependencies` in `project/
dependencies {
...
implementation project(':clappr')
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.2.71"
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.41"
...
}
```
Expand Down Expand Up @@ -66,7 +66,7 @@ Following, add following lines to `dependencies` section in `project/build.gradl
```
dependencies {
...
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.2.71"
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.41"
implementation "com.android.support:appcompat-v7:28.0.0"
implementation "com.android.support:support-v4:28.0.0"
implementation 'com.google.android.exoplayer:exoplayer:2.9.2'
Expand Down
14 changes: 4 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.21'
ext.kotlin_version = '1.3.41'
ext.android_support_version = '28.0.0'


repositories {
mavenCentral()
mavenLocal()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'net.saliman:gradle-cobertura-plugin:2.2.5'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -28,9 +25,6 @@ allprojects {
mavenCentral()
mavenLocal()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
}
2 changes: 1 addition & 1 deletion clappr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply plugin: 'org.jetbrains.dokka-android'
apply from: 'versioning.gradle'

group = 'io.clappr.player'
version = '0.27.0'
version = '0.27.1'

def publishAttrs = buildPublishAttrs(version)

Expand Down
4 changes: 4 additions & 0 deletions clappr/src/main/kotlin/io/clappr/player/Player.kt
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ open class Player(private val base: BaseObject = BaseObject(),
core = Core(options)
}

protected fun destroyCore() {
core = null
}

/**
* Load a new media. Always make sure that the stop() method was called before invoking this
*
Expand Down
1 change: 1 addition & 0 deletions doc/clappr/io.clappr.player/-player/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Once instantiated it should be [configured](configure.md) and added to a view hi
| Name | Summary |
|---|---|
| [configure](configure.md) | `open fun configure(options: `[`Options`](../../io.clappr.player.base/-options/index.md)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)<br>Configure Player. This configuration must be performed before adding fragment to a view hierarchy. |
| [destroyCore](destroy-core.md) | `fun destroyCore(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) |
| [holdKeyEvent](hold-key-event.md) | `fun holdKeyEvent(event: `[`KeyEvent`](https://developer.android.com/reference/android/view/KeyEvent.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) |
| [load](load.md) | `fun load(source: `[`String`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html)`, mimeType: `[`String`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html)`? = null): `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html)<br>Load a new media. Always make sure that the stop() method was called before invoking this`fun load(source: `[`String`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html)`): `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html) |
| [onCreateView](on-create-view.md) | `open fun onCreateView(inflater: `[`LayoutInflater`](https://developer.android.com/reference/android/view/LayoutInflater.html)`, container: `[`ViewGroup`](https://developer.android.com/reference/android/view/ViewGroup.html)`?, savedInstanceState: `[`Bundle`](https://developer.android.com/reference/android/os/Bundle.html)`?): `[`View`](https://developer.android.com/reference/android/view/View.html) |
Expand Down

0 comments on commit 11c0af4

Please sign in to comment.