From 64bce8cf1776a6bb88bd357e8ede37af2a6d18bc Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Thu, 25 May 2023 19:09:48 -0300 Subject: [PATCH 1/8] feat(jitpack): add jitpack config file - add jitpack config to use correct java version - add release properties to build.gradle closes #3 --- androidenhancedvideoplayer/build.gradle | 15 +++++++++++++++ jitpack.yml | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 jitpack.yml diff --git a/androidenhancedvideoplayer/build.gradle b/androidenhancedvideoplayer/build.gradle index 9f5d17d4..3659d15b 100644 --- a/androidenhancedvideoplayer/build.gradle +++ b/androidenhancedvideoplayer/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' + id 'maven-publish' } android { @@ -68,3 +69,17 @@ dependencies { implementation "androidx.media3:media3-ui:$mediaVersion" implementation "androidx.media3:media3-exoplayer-dash:$mediaVersion" } + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + + groupId = 'com.github.profusion' + artifactId = 'android-enhanced-video-player' + version = '1.0' + } + } + } +} diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 00000000..efde7bf2 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk17 From 8a773bdac483a88248942ab89b340de0ca953b2c Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Thu, 25 May 2023 19:19:29 -0300 Subject: [PATCH 2/8] docs(jitpack): add jitpack badge to readme closes #3 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a5294354..da959e05 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # android-enhanced-video-player Enhanced Video Player for Android built on top of Exoplayer compliant with Android Jetpack Compose +[![](https://jitpack.io/v/profusion/android-enhanced-video-player.svg)](https://jitpack.io/#profusion/android-enhanced-video-player) + ## Table of Contents - [Table of Contents](#table-of-contents) From 971759115786ddd9d8c28d0ba9ffad54d6677d25 Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 26 May 2023 11:13:42 -0300 Subject: [PATCH 3/8] chore(gitignore): move gitignore rules to the root closes #3 --- .gitignore | 1 + androidenhancedvideoplayer/.gitignore | 1 - app/.gitignore | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 androidenhancedvideoplayer/.gitignore delete mode 100644 app/.gitignore diff --git a/.gitignore b/.gitignore index a728eeca..83ff3bc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Gradle files .gradle/ build/ +**/build/ # generated files bin/ diff --git a/androidenhancedvideoplayer/.gitignore b/androidenhancedvideoplayer/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/androidenhancedvideoplayer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build From c139126d5bc186db8413b530e8f07b6b9a9eb254 Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 26 May 2023 11:15:15 -0300 Subject: [PATCH 4/8] fixup! feat(jitpack): add jitpack config file --- jitpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jitpack.yml b/jitpack.yml index efde7bf2..9169afde 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk17 + - openjdk19 From f1448f0ef2a4be72803bbd7746e5c12483ef930d Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 26 May 2023 11:38:27 -0300 Subject: [PATCH 5/8] chore(update-libs): update libs and compose plugin closes #3 --- androidenhancedvideoplayer/build.gradle | 8 ++++---- app/build.gradle | 8 ++++---- build.gradle | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/androidenhancedvideoplayer/build.gradle b/androidenhancedvideoplayer/build.gradle index 3659d15b..117637b5 100644 --- a/androidenhancedvideoplayer/build.gradle +++ b/androidenhancedvideoplayer/build.gradle @@ -37,7 +37,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.3.2' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { @@ -48,9 +48,9 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' - implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' diff --git a/app/build.gradle b/app/build.gradle index 8a12b37e..3a12cb61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.3.2' + kotlinCompilerExtensionVersion '1.4.7' } packagingOptions { resources { @@ -48,9 +48,9 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' - implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' diff --git a/build.gradle b/build.gradle index 1da9f697..91a8223a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,9 @@ buildscript { } plugins { - id 'com.android.application' version '8.0.0' apply false - id 'com.android.library' version '8.0.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.android.application' version '8.0.1' apply false + id 'com.android.library' version '8.0.1' apply false + id 'org.jetbrains.kotlin.android' version '1.8.21' apply false id 'org.jlleitschuh.gradle.ktlint' version "11.3.2" } From beeb913194122c9f4bde224b4c9ebadefbf5f87a Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 26 May 2023 14:10:51 -0300 Subject: [PATCH 6/8] chore(JavaVersion): update source and target to Java 19 closes #3 --- androidenhancedvideoplayer/build.gradle | 6 +++--- app/build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/androidenhancedvideoplayer/build.gradle b/androidenhancedvideoplayer/build.gradle index 117637b5..0f4cd0e1 100644 --- a/androidenhancedvideoplayer/build.gradle +++ b/androidenhancedvideoplayer/build.gradle @@ -24,12 +24,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_19 + targetCompatibility JavaVersion.VERSION_19 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '19' } buildFeatures { diff --git a/app/build.gradle b/app/build.gradle index 3a12cb61..740ef3f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,11 +27,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_19 + targetCompatibility JavaVersion.VERSION_19 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '19' } buildFeatures { compose true From 27014e74d95fa17af127b4a305c54821703dc729 Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 26 May 2023 14:22:28 -0300 Subject: [PATCH 7/8] chore(JavaVersion): update CI to use temurin 19 --- .github/workflows/android-jetpack.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-jetpack.yml b/.github/workflows/android-jetpack.yml index e4c5ecbe..05659b24 100644 --- a/.github/workflows/android-jetpack.yml +++ b/.github/workflows/android-jetpack.yml @@ -28,7 +28,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '19' cache: 'gradle' - name: Grant execute permission for gradlew @@ -63,7 +63,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '19' cache: 'gradle' - name: Setup yarn uses: actions/setup-node@v3 @@ -87,7 +87,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '19' cache: 'gradle' - name: Setup yarn uses: actions/setup-node@v3 From db2d457a36ff3b20a1171f79c0195725f5bb453e Mon Sep 17 00:00:00 2001 From: Andrey Freitas Date: Fri, 15 Dec 2023 17:56:44 -0300 Subject: [PATCH 8/8] chore(jitpack): update jitpack yml to use sdkman --- jitpack.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jitpack.yml b/jitpack.yml index 9169afde..f476d5cf 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,3 @@ -jdk: - - openjdk19 +before_install: + - sdk install java 19.0.1-open + - sdk use java 19.0.1-open \ No newline at end of file