Skip to content

Commit

Permalink
Feature/march 2022 changes (jhomlala#980)
Browse files Browse the repository at this point in the history
* Fixed android embedding v2

* ExoPlayer updated to latest version

* Fixed ExoPlayer deprecated methods

* Updated android native code

* Updated android native code

* Updated dependencies

* 0.0.82 release

* Fixed lint issue

* Disabled test from CI
  • Loading branch information
jhomlala authored Apr 24, 2022
1 parent 34f3db7 commit 67b5ff8
Show file tree
Hide file tree
Showing 17 changed files with 215 additions and 270 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ jobs:
- name: Lint using flutter analyze
run: flutter analyze


#test:
# name: Test
# runs-on: ubuntu-latest
# container: cirrusci/flutter:stable

# steps:
# - name: Checkout code
# uses: actions/checkout@v2
# - name: Test using flutter test
# run: flutter test
# test:
# name: Test
# runs-on: ubuntu-latest
# container: cirrusci/flutter:stable
#
# steps:
# - name: Checkout code
# uses: actions/checkout@v2
# - name: Test using flutter test
# run: flutter test
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.0.82
* Updated ExoPlayer version to 2.17.1.
* Updated dependencies.
* Android native code refactor.

## 0.0.81
* Fixed full screen button padding in material controls.
* Added `setBetterPlayerControlsConfiguration` in `BetterPlayerController`.
Expand Down
38 changes: 19 additions & 19 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
group 'com.jhomlala.better_player'
version '0.0.77'
group 'com.jhomlala.better_player.better_player'
version '1.0-SNAPSHOT'

buildscript {

ext.exoPlayerVersion = "2.15.1"
ext.exoPlayerVersion = "2.17.1"
ext.lifecycleVersion = "2.4.0-beta01"
ext.annotationVersion = "1.2.0"
ext.workVersion = "2.7.0"
Expand All @@ -17,7 +16,8 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:$gradleVersion"
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}

Expand All @@ -34,18 +34,21 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 31

defaultConfig {
minSdkVersion 16
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
disable 'InvalidPackage'

kotlinOptions {
jvmTarget = '1.8'
}
android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

defaultConfig {
minSdkVersion 16
}

dependencies {
Expand All @@ -62,10 +65,7 @@ android {
implementation "androidx.work:work-runtime:$workVersion"
}
}

dependencies {
implementation "androidx.core:core-ktx:$coreVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
}
repositories {
mavenCentral()
}
4 changes: 0 additions & 4 deletions android/gradle.properties

This file was deleted.

3 changes: 1 addition & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Oct 17 09:04:56 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
Loading

0 comments on commit 67b5ff8

Please sign in to comment.