Merge branch 'maintenance/kotlin_gradle_version' into develop

THEOplayer · Dec 21, 2023 · 7f665a9 · 7f665a9
2 parents 77b3821 + 7ecdc67
commit 7f665a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.4.1] - 23-12-21
+
+### Changed
+
+- Take the Kotlin Gradle plugin version from the root project, if specified.
+
 ## [3.4.0] - 23-12-21
 
 ### Added

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,16 @@
 buildscript {
+  ext.safeExtGet = { prop, fallback ->
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  }
+
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
     classpath 'com.android.tools.build:gradle:7.4.2'
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.8.21')}"
   }
 }