Maintenance/gradle bump 7.3.1

flutter_theolive_sdk/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [Unreleased]
+
+* [Android] Updated Gradle version to 7.3.1
+* [Android] Fixed Gradle namespace issue
+
 ## 1.0.1
 
 * Updated documentation.

flutter_theolive_sdk/example/android/app/build.gradle

@@ -26,6 +26,10 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.theolive.theolive_example'
+    }
+
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 

flutter_theolive_sdk/example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

flutter_theolive_sdk/lib/theolive.dart

@@ -1,13 +1,14 @@
 import 'package:flutter/widgets.dart';
 import 'package:theolive/theolive_state.dart';
 import 'package:theolive/theolive_view.dart';
-import 'package:theolive_platform_interface/debug_helpers.dart';
+import 'package:theolive_platform_interface/helpers/debug_helpers.dart';
 import 'package:theolive_platform_interface/theolive_event_listener.dart';
 import 'package:theolive_platform_interface/theolive_playerconfig.dart';
 import 'package:theolive_platform_interface/theolive_view_controller_interface.dart';
 
 export 'package:theolive_platform_interface/theolive_playerconfig.dart';
 export 'package:theolive_platform_interface/theolive_event_listener.dart';
+export 'package:theolive_platform_interface/helpers/theologger.dart';
 
 typedef PlayerCreatedCallback = void Function();
 typedef StateChangeListener = void Function();

flutter_theolive_sdk_android/android/build.gradle

@@ -6,15 +6,11 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-
         maven { url 'https://mvn.theoplayer.com/releases' }
-        // for THEOplayer Android Core dependencies:
-        maven { url 'https://jitpack.io' }
-
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -23,11 +19,7 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
-
         maven { url 'https://mvn.theoplayer.com/releases' }
-        // for THEOplayer Android Core dependencies:
-        maven { url 'https://jitpack.io' }
-
     }
 }
 
@@ -36,6 +28,10 @@ apply plugin: 'kotlin-android'
 def theoliveVersion ='3.13.1'
 
 android {
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.theolive.flutter'
+    }
+
     compileSdkVersion 31
 
     compileOptions {

flutter_theolive_sdk_android/lib/theolive_android.dart

@@ -6,7 +6,7 @@ import 'package:flutter/widgets.dart';
 import 'package:theolive_android/theolive_viewcontroller_android.dart';
 import 'package:theolive_platform_interface/theolive_platform_interface.dart';
 import 'package:theolive_platform_interface/theolive_playerconfig.dart';
-import 'package:theolive_platform_interface/debug_helpers.dart';
+import 'package:theolive_platform_interface/helpers/debug_helpers.dart';
 
 class THEOliveAndroid extends TheolivePlatform {
   /// Registers this class as the default instance of [TheoplayerPlatform].

flutter_theolive_sdk_ios/lib/theolive_ios.dart

@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 import 'package:theolive_ios/theolive_viewcontroller_ios.dart';
 import 'package:theolive_platform_interface/theolive_platform_interface.dart';
 import 'package:theolive_platform_interface/theolive_playerconfig.dart';
-import 'package:theolive_platform_interface/debug_helpers.dart';
+import 'package:theolive_platform_interface/helpers/debug_helpers.dart';
 
 class THEOliveIOS extends TheolivePlatform {
   /// Registers this class as the default instance of [TheoplayerPlatform].

flutter_theolive_sdk_platform_interface/lib/helpers/debug_helpers.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/foundation.dart';
+
+void dprint(Object? object) {
+  if (kDebugMode) {
+    print(object);
+  }
+}
+

flutter_theolive_sdk_platform_interface/lib/debug_helpers.dart → flutter_theolive_sdk_platform_interface/lib/helpers/theologger.dart

@@ -1,26 +1,5 @@
 import 'package:flutter/foundation.dart';
 
-void dprint(Object? object) {
-  if (kDebugMode) {
-    print(object);
-  }
-}
-
-void exceptionHandler({required String tag, required Exception exception, String? context = null, StackTrace? stacktrace = null}) {
-  if (kDebugMode) {
-    throw exception;
-  } else {
-    final prefix = "[$tag]";
-    final ctx = context != null ? "[C:$context]" : "";
-    var logMessage = "THEOLogger$prefix$ctx - Exception happened: $exception";
-    if (!THEOLogger.instance.isListening()) {
-      logMessage += " - for more info, attach a logger to THEOLogger.instance!";
-    }
-    print(logMessage);
-    THEOLogger.instance._log(exception, stacktrace);
-  }
-}
-
 /**
  * Logger class to capture logs and exceptions
  * NOTE:
@@ -54,4 +33,19 @@ class THEOLogger {
 
 abstract class THEOLoggerCallback {
   void onException(Exception e, StackTrace stackTrace);
+}
+
+void exceptionHandler({required String tag, required Exception exception, String? context = null, StackTrace? stacktrace = null}) {
+  if (kDebugMode) {
+    throw exception;
+  } else {
+    final prefix = "[$tag]";
+    final ctx = context != null ? "[C:$context]" : "";
+    var logMessage = "THEOLogger$prefix$ctx - Exception happened: $exception";
+    if (!THEOLogger.instance.isListening()) {
+      logMessage += " - for more info, attach a logger to THEOLogger.instance!";
+    }
+    print(logMessage);
+    THEOLogger.instance._log(exception, stacktrace);
+  }
 }

flutter_theolive_sdk_platform_interface/lib/theolive_view_controller_mobile.dart

@@ -1,4 +1,4 @@
-import 'package:theolive_platform_interface/debug_helpers.dart';
+import 'package:theolive_platform_interface/helpers/theologger.dart';
 import 'package:theolive_platform_interface/pigeon/theolive_api.g.dart';
 import 'package:theolive_platform_interface/pigeon_multi_instance_wrapper.dart';
 import 'package:theolive_platform_interface/theolive_event_listener.dart';