increment gradle from 7.4.1 to 8.2 and gradle plugin from 7.1.3 to 8.2.1, and compilation version from 34 to 35; several changes as consequence of the previous ones - adding namespace, and fix some java vs kotlin version mismatch

gjcastanheiro · gjcastanheiro · commit 94ba09a6a694 · 2025-07-17T10:45:57.000+01:00
diff --git a/brightcove-exoplayer-kotlin/AdRulesIMASampleApp/build.gradle b/brightcove-exoplayer-kotlin/AdRulesIMASampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.adrulesima"
 
     defaultConfig {
         applicationId "com.brightcove.adrulesima"
diff --git a/brightcove-exoplayer-kotlin/AdRulesIMAWidevineModularSampleApp/build.gradle b/brightcove-exoplayer-kotlin/AdRulesIMAWidevineModularSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.example.adrulesima.widevinemodular"
 
     defaultConfig {
         applicationId "com.example.adrulesima.widevinemodular"
diff --git a/brightcove-exoplayer-kotlin/AppCompatActivitySampleApp/build.gradle b/brightcove-exoplayer-kotlin/AppCompatActivitySampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.appcompatactivity"
 
     defaultConfig {
         applicationId "com.brightcove.appcompatactivity"
diff --git a/brightcove-exoplayer-kotlin/AppCompatFragmentSampleApp/build.gradle b/brightcove-exoplayer-kotlin/AppCompatFragmentSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.appcompatfragment"
 
     defaultConfig {
         applicationId "com.brightcove.appcompatfragment"
diff --git a/brightcove-exoplayer-kotlin/BasicCastBrightcoveReceiverSampleApp/build.gradle b/brightcove-exoplayer-kotlin/BasicCastBrightcoveReceiverSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.castreceiver"
 
     defaultConfig {
         applicationId "com.brightcove.castreceiver"
diff --git a/brightcove-exoplayer-kotlin/BasicDAISampleApp/build.gradle b/brightcove-exoplayer-kotlin/BasicDAISampleApp/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace "com.brightcove.player.samples.exoplayer.dai.basic"
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
         targetSdkVersion ANDROID_TARGET_SDK_VERSION
diff --git a/brightcove-exoplayer-kotlin/BasicSampleApp/build.gradle b/brightcove-exoplayer-kotlin/BasicSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.basic.sample"
 
     defaultConfig {
         applicationId "com.brightcove.basic.sample"
diff --git a/brightcove-exoplayer-kotlin/BumperSampleApp/build.gradle b/brightcove-exoplayer-kotlin/BumperSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.bumper.sample"
 
     defaultConfig {
         applicationId "com.brightcove.bumper.sample"
diff --git a/brightcove-exoplayer-kotlin/OfflinePlaybackSampleApp/build.gradle b/brightcove-exoplayer-kotlin/OfflinePlaybackSampleApp/build.gradle
@@ -22,13 +22,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
diff --git a/brightcove-exoplayer-kotlin/ThumbnailScrubberSampleApp/build.gradle b/brightcove-exoplayer-kotlin/ThumbnailScrubberSampleApp/build.gradle
@@ -22,13 +22,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
diff --git a/brightcove-exoplayer-kotlin/VideoListAdRulesIMASampleApp/build.gradle b/brightcove-exoplayer-kotlin/VideoListAdRulesIMASampleApp/build.gradle
@@ -22,13 +22,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
diff --git a/brightcove-exoplayer-kotlin/VideoListSampleApp/build.gradle b/brightcove-exoplayer-kotlin/VideoListSampleApp/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.videolist"
 
     defaultConfig {
         applicationId "com.brightcove.videolist"
diff --git a/brightcove-exoplayer/360VideoSampleApp/build.gradle b/brightcove-exoplayer/360VideoSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.video360'
+}
diff --git a/brightcove-exoplayer/AdRulesIMASampleApp/build.gradle b/brightcove-exoplayer/AdRulesIMASampleApp/build.gradle
@@ -1,5 +1,6 @@
 android {
-  defaultConfig.applicationId = "com.brightcove.player.samples.exoplayer.ima.adrules"
+  defaultConfig.applicationId = "com.brightcove.player.samples.ima.exoplayer.adrules"
+    namespace "com.brightcove.player.samples.ima.exoplayer.adrules"
 
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
diff --git a/brightcove-exoplayer/AdRulesIMAWidevineModularSampleApp/build.gradle b/brightcove-exoplayer/AdRulesIMAWidevineModularSampleApp/build.gradle
@@ -1,5 +1,6 @@
 android {
-  defaultConfig.applicationId = "com.brightcove.player.samples.exoplayer.imawidevine.adrules"
+  defaultConfig.applicationId = "com.brightcove.player.samples.imawidevinemodular.adrules"
+  namespace "com.brightcove.player.samples.imawidevinemodular.adrules"
 
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
diff --git a/brightcove-exoplayer/AppCompatActivitySampleApp/build.gradle b/brightcove-exoplayer/AppCompatActivitySampleApp/build.gradle
@@ -1,3 +1,7 @@
+android {
+  namespace 'com.brightcove.player.samples.appcompat.activity'
+}
+
 dependencies {
   implementation "com.brightcove.player:android-appcompat-plugin:${anpVersion}"
   implementation "androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT}"
diff --git a/brightcove-exoplayer/AppCompatFragmentSampleApp/build.gradle b/brightcove-exoplayer/AppCompatFragmentSampleApp/build.gradle
@@ -1,3 +1,7 @@
+android {
+  namespace 'com.brightcove.player.samples.appcompat.fragment'
+}
+
 dependencies {
   implementation "com.brightcove.player:android-appcompat-plugin:${anpVersion}"
   implementation "androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT}"
diff --git a/brightcove-exoplayer/AudioOnlySampleApp/build.gradle b/brightcove-exoplayer/AudioOnlySampleApp/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.player.samples.audioonly"
 
     defaultConfig {
         applicationId "com.brightcove.player.samples.audioonly"
diff --git a/brightcove-exoplayer/BasicCastBrightcoveReceiverSampleApp/build.gradle b/brightcove-exoplayer/BasicCastBrightcoveReceiverSampleApp/build.gradle
@@ -1,4 +1,5 @@
 android {
+    namespace "com.brightcove.player.samples.cast.basic"
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
         targetSdkVersion ANDROID_TARGET_SDK_VERSION
diff --git a/brightcove-exoplayer/BasicDAISampleApp/build.gradle b/brightcove-exoplayer/BasicDAISampleApp/build.gradle
@@ -1,4 +1,5 @@
 android {
+    namespace "com.brightcove.player.samples.exoplayer.dai.basic"
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
         targetSdkVersion ANDROID_TARGET_SDK_VERSION
diff --git a/brightcove-exoplayer/BasicIMAVASTSampleApp/build.gradle b/brightcove-exoplayer/BasicIMAVASTSampleApp/build.gradle
@@ -1,4 +1,5 @@
 android {
+    namespace "com.brightcove.player.samples.ima.basic"
     defaultConfig {
         minSdkVersion ANDROID_MIN_SDK_VERSION
         targetSdkVersion ANDROID_TARGET_SDK_VERSION
diff --git a/brightcove-exoplayer/BasicSSAIPALSampleApp/build.gradle b/brightcove-exoplayer/BasicSSAIPALSampleApp/build.gradle
@@ -2,9 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.player.samples.ssai.pal"
 
     defaultConfig {
-        applicationId "com.brightcove.player.samples.ssai.basic"
+        applicationId "com.brightcove.player.samples.ssai.pal"
         targetSdkVersion ANDROID_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
diff --git a/brightcove-exoplayer/BasicSampleApp/build.gradle b/brightcove-exoplayer/BasicSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.basic'
+}
diff --git a/brightcove-exoplayer/BasicSsaiSampleApp/build.gradle b/brightcove-exoplayer/BasicSsaiSampleApp/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.player.samples.ssai.basic"
 
     defaultConfig {
         applicationId "com.brightcove.player.samples.ssai.basic"
diff --git a/brightcove-exoplayer/BumperSampleApp/build.gradle b/brightcove-exoplayer/BumperSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.bumper'
+}
diff --git a/brightcove-exoplayer/FreeWheelSampleApp/build.gradle b/brightcove-exoplayer/FreeWheelSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.freewheel.basic'
+}
diff --git a/brightcove-exoplayer/FreeWheelWidevineModularSampleApp/build.gradle b/brightcove-exoplayer/FreeWheelWidevineModularSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.freewheelwidevinemodular.basic'
+}
diff --git a/brightcove-exoplayer/LiveSampleApp/build.gradle b/brightcove-exoplayer/LiveSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.live'
+}
diff --git a/brightcove-exoplayer/OfflinePlaybackSampleApp/build.gradle b/brightcove-exoplayer/OfflinePlaybackSampleApp/build.gradle
@@ -1,3 +1,7 @@
+android {
+    namespace 'com.brightcove.player.samples.offlineplayback'
+}
+
 dependencies {
     implementation "androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT}"
     implementation "androidx.recyclerview:recyclerview:${ANDROIDX_RECYCLER_VIEW}"
diff --git a/brightcove-exoplayer/PictureInPictureSampleApp/build.gradle b/brightcove-exoplayer/PictureInPictureSampleApp/build.gradle
@@ -1,3 +1,7 @@
+android {
+    namespace 'com.brightcove.player.samples.pictureinpicture'
+}
+
 dependencies {
     implementation "androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT}"
     implementation "androidx.constraintlayout:constraintlayout:${ANDROIDX_CONSTRAINT_LAYOUT}"
diff --git a/brightcove-exoplayer/PulseSampleApp/build.gradle b/brightcove-exoplayer/PulseSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.pulse'
+}
diff --git a/brightcove-exoplayer/TextureViewSampleApp/build.gradle b/brightcove-exoplayer/TextureViewSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.texture'
+}
diff --git a/brightcove-exoplayer/ThumbnailScrubberSampleApp/build.gradle b/brightcove-exoplayer/ThumbnailScrubberSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.thumbnail'
+}
diff --git a/brightcove-exoplayer/VideoListAdRulesIMASampleApp/build.gradle b/brightcove-exoplayer/VideoListAdRulesIMASampleApp/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.recyclervideoview"
     defaultConfig {
         applicationId "com.brightcove.recyclervideoview"
         minSdkVersion 21
diff --git a/brightcove-exoplayer/VideoListSampleApp/build.gradle b/brightcove-exoplayer/VideoListSampleApp/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+    namespace "com.brightcove.recyclervideoview"
     defaultConfig {
         applicationId "com.brightcove.recyclervideoview"
         minSdkVersion 21
diff --git a/brightcove-exoplayer/WidevineModularSampleApp/build.gradle b/brightcove-exoplayer/WidevineModularSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.samples.exoplayer.widevine'
+}
diff --git a/brightcove-player-controls/CustomizedControlsSampleApp/build.gradle b/brightcove-player-controls/CustomizedControlsSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.customizedcontrol'
+}
diff --git a/brightcove-player-controls/RewindArrowLeftSampleApp/build.gradle b/brightcove-player-controls/RewindArrowLeftSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.arrowleftrewind'
+}
diff --git a/brightcove-player-controls/RewindBackwardSampleApp/build.gradle b/brightcove-player-controls/RewindBackwardSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.backwardrewind'
+}
diff --git a/brightcove-player-controls/RewindStepBackwardSampleApp/build.gradle b/brightcove-player-controls/RewindStepBackwardSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.stepbackwardrewind'
+}
diff --git a/brightcove-player-controls/SeekBarColorsSampleApp/build.gradle b/brightcove-player-controls/SeekBarColorsSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.seekbarcolors'
+}
diff --git a/brightcove-player-controls/StyledControlsSampleApp/build.gradle b/brightcove-player-controls/StyledControlsSampleApp/build.gradle
@@ -0,0 +1,3 @@
+android {
+    namespace 'com.brightcove.player.demo.styledcontrol'
+}
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.1.3'
+    classpath 'com.android.tools.build:gradle:8.2.1'
     classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
     classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
   }
diff --git a/constants.gradle b/constants.gradle
@@ -1,7 +1,7 @@
 project.ext {
     ANDROID_MIN_SDK_VERSION = 21
     ANDROID_TARGET_SDK_VERSION = 34
-    ANDROID_COMPILE_SDK_VERSION = 34
+    ANDROID_COMPILE_SDK_VERSION = 35
     ANDROID_BUILD_TOOLS_VERSION = '30.0.3'
     ANDROID_MATERIAL = '1.6.1'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 17 15:27:54 CDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace "com.brightcove.player.samples.exoplayer.dai.basic"`
`7`	`8`	`defaultConfig {`
`8`	`9`	`minSdkVersion ANDROID_MIN_SDK_VERSION`
`9`	`10`	`targetSdkVersion ANDROID_TARGET_SDK_VERSION`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,6 @@ android {`
`22`	`22`	`proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`- compileOptions {`
`26`		`- sourceCompatibility JavaVersion.VERSION_11`
`27`		`- targetCompatibility JavaVersion.VERSION_11`
`28`		`- }`
`29`		`- kotlinOptions {`
`30`		`- jvmTarget = '1.8'`
`31`		`- }`
`32`	`25`	`}`
`33`	`26`
`34`	`27`	`dependencies {`