Merge pull request #81 from dev-labs-bg/develop

Version 1.2.0

build.gradle

@@ -15,25 +15,28 @@
  */
 
 apply from: './dependencies.gradle'
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply from: "${rootDir}/scripts/publish-root.gradle"
 
 buildscript {
     apply from: './dependencies.gradle'
     repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.gradlePlugin"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.bintrayPlugin"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
     }
 }
 
 allprojects {
     repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

dependencies.gradle

@@ -16,19 +16,20 @@
 
 ext.versions = [
         minSdk            : 19,
-        compileSdk        : 29,
-        buildTools        : '28.0.3',
-        publishVersion    : '1.1.6',
+        compileSdk        : 30,
+        buildTools        : '29.0.2',
+        publishVersion    : '1.2.0',
         publishVersionCode: 1,
-        gradlePlugin      : '3.6.2',
-        bintrayPlugin     : '1.8.4',
-        mavenPlugin       : '1.4.1',
+        gradlePlugin      : '7.0.3',
 
-        core              : '1.3.2',
-        appcompat         : '1.1.0',
-        material          : '1.1.0',
-        constraintLayout  : '1.1.3',
-        espresso          : '3.0.1',
-        kotlin            : '1.3.61',
-        leakCanary        : '2.0'
+        core              : '1.6.0',
+        appcompat         : '1.3.1',
+        material          : '1.4.0',
+        constraintLayout  : '2.1.1',
+        kotlin            : '1.5.31',
+        leakCanary        : '2.6',
+
+        test_rules        : '1.4.0',
+        espresso_core     : '3.4.0',
+        junit_ext         : '1.1.3'
 ]

library/build.gradle → fullscreen-video-view/build.gradle

@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
+ext {
+    PUBLISH_GROUP_ID = 'bg.devlabs'
+    PUBLISH_VERSION = '1.2.0'
+    PUBLISH_ARTIFACT_ID = 'fullscreen-video-view'
+}
+
 apply plugin: 'com.android.library'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'maven-publish'
+apply plugin: 'kotlin-android'
 apply from: '../dependencies.gradle'
+apply from: "${rootDir}/scripts/publish-module.gradle"
 
 android {
     compileSdkVersion versions.compileSdk
@@ -29,49 +35,30 @@ android {
         versionCode versions.publishVersionCode
         versionName versions.publishVersion
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
 }
 
 dependencies {
-    implementation "androidx.core:core:$versions.core"
+    implementation "androidx.core:core-ktx:$versions.core"
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
     implementation "com.google.android.material:material:$versions.material"
     implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
 }
 
-ext {
-    bintrayRepo = 'maven'
-    bintrayName = 'fullscreen-video-view'
-
-    publishedGroupId = 'bg.devlabs.fullscreenvideoview'
-    libraryName = 'fullscreen-video-view'
-    artifact = 'library'
-
-    libraryDescription = 'A custom VideoView Android library which makes video views usage easy'
-
-    siteUrl = 'https://github.com/dev-labs-bg/fullscreen-video-view'
-    gitUrl = 'https://github.com/dev-labs-bg/fullscreen-video-view.git'
-
-    libraryVersion = '1.1.6'
-
-    developerId = 'slavipetrov'
-    developerName = 'Slavi Petrov'
-    developerEmail = '[email protected]'
-
-    licenseName = 'Apache-2.0'
-    licenseUrl = 'https://github.com/dev-labs-bg/fullscreen-video-view/blob/master/LICENSE'
-    allLicenses = ["Apache-2.0"]
-}
-
 // Turn off javadocs as currently it doesn't work with kotlin
-tasks.withType(Javadoc).all {
-    enabled = false
-}
-
-if (project.rootProject.file('local.properties').exists()) {
-    apply from: 'https://raw.githubusercontent.com/dev-labs-bg/JCenter/master/installv1.gradle'
-    apply from: 'https://raw.githubusercontent.com/dev-labs-bg/JCenter/master/bintrayv1.gradle'
-}
+//tasks.withType(Javadoc).all {
+//    enabled = false
+//}

library/src/main/java/bg/devlabs/fullscreenvideoview/FullscreenVideoMediaPlayer.java → fullscreen-video-view/src/main/java/bg/devlabs/fullscreenvideoview/FullscreenVideoMediaPlayer.java

@@ -117,6 +117,7 @@ public void onPauseResume() {
             pause();
         } else {
             start();
+            listener.onMediaPlayerStarted();
         }
     }
 
@@ -142,4 +143,10 @@ public void changePlaybackSpeed(float speed) {
         playbackParams.setSpeed(speed);
         setPlaybackParams(playbackParams);
     }
+
+    public void seekBy(int duration) {
+        int position = getCurrentPosition();
+        position += duration; // milliseconds
+        seekTo(position);
+    }
 }