Skip to content

Commit

Permalink
chore(*): move to gradle 8
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibaultBee committed Oct 26, 2023
1 parent 03f74fd commit 45bee8f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
10 changes: 3 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ buildscript {
exoPlayerVersion = '1.1.1'
analyticsVersion = '2.0.2'
}

dependencies {
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
}
}
plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'com.android.application' version '8.1.2' apply false
id 'com.android.library' version '8.1.2' apply false
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
id 'org.jetbrains.dokka' version "$dokkaVersion"
}
apply plugin: 'org.jetbrains.dokka'

tasks.register('clean', Delete) {
delete rootProject.buildDir
Expand Down
4 changes: 4 additions & 0 deletions common_library.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ android {
viewBinding true
}

kotlinOptions {
jvmTarget = '1.8'
}

testOptions {
unitTests.returnDefaultValues = true
}
Expand Down
1 change: 1 addition & 0 deletions examples/view/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ android {
buildFeatures {
viewBinding true
}
namespace 'video.api.player.example'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions examples/view/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="video.api.player.example">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jan 17 17:38:22 CET 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
4 changes: 4 additions & 0 deletions player/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ plugins {
apply from: "${project.rootDir}/common_library.gradle"
apply from: "${project.rootDir}/publish.gradle"

android {
namespace 'video.api.player'
}

ext {
artifactName = 'android-player'
artifactDescription = 'Android player for api.video delivery.'
Expand Down
3 changes: 1 addition & 2 deletions player/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="video.api.player">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<!--This permission is required to use the ExoPlayer for Android >= 33-->
Expand Down

0 comments on commit 45bee8f

Please sign in to comment.