Merge pull request #55 from appodeal/release/3.2.0-beta.3

da2gl · web-flow · commit 39a4b3c8e58f · 2023-11-24T11:14:43.000+01:00
Release/3.2.0-beta.3 (SDK-5290)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.2.0-beta.3
+
+* Updated Kotlin to 1.8.10 and use bom for align all kotlin versions
+* Added android namespace for AGP version > 8;
+
 ## 3.2.0-beta.2
 
 * Updated Appodeal iOS SDK to [3.2.0-beta.2](https://docs.appodeal.com/ios/changelog)
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Add the dependency to the `pubspec.yaml` file in your project:
 
 ```yaml
 dependencies:
-  stack_appodeal_flutter: 3.2.0-beta.2
+  stack_appodeal_flutter: 3.2.0-beta.3
 ```
 
 Install the plugin by running the command below in the terminal:
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,7 +1,7 @@
 group 'com.appodeal.appodeal_flutter'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
@@ -25,6 +25,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.appodeal.appodeal_flutter'
+    }
+
     compileSdk 33
 
     defaultConfig {
@@ -47,7 +52,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version"))
     // Appodeal SDK 3.2.0.1-beta.2
     implementation 'com.appodeal.ads.sdk:core:3.2.0-beta.2'
     implementation 'com.appodeal.ads.sdk.networks:iab:3.2.0.0-beta.2'
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdk 33
+    namespace 'com.appodeal.appodeal_flutter_example'
 
     defaultConfig {
         minSdk 21
@@ -62,7 +63,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version"))
     // Appodeal SDK 3.2.0.1-beta.2
     implementation 'com.appodeal.ads:sdk:3.2.0.1-beta.2'
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.appodeal.appodeal_flutter_example">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:icon="@mipmap/ic_launcher"
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.0'
     }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -55,7 +55,14 @@ class _AppodealDemoAppState extends State<AppodealDemoApp> {
       home: Scaffold(
         appBar: AppBar(
           centerTitle: true,
-          title: const Text('Appodeal Flutter Demo'),
+          title: Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text('Appodeal Flutter Demo', style: TextStyle(fontSize: 20)),
+              Text('ver. ${Appodeal.getSDKVersion()}',
+                  style: TextStyle(fontSize: 14)),
+            ],
+          ),
         ),
         body: Column(children: [
           Row(
diff --git a/ios/stack_appodeal_flutter.podspec b/ios/stack_appodeal_flutter.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'stack_appodeal_flutter'
-  s.version          = '3.2.0-beta.2'
+  s.version          = '3.2.0-beta.3'
   s.summary          = 'Appodeal flutter plugin'
   s.description      = <<-DESC
   Flutter plugin for Appodeal SDK. It supports interstitial, rewarded video and banner ads.
diff --git a/lib/src/appodeal.dart b/lib/src/appodeal.dart
@@ -355,7 +355,7 @@ class Appodeal {
 
   /// Get SDK version.
   static String getSDKVersion() {
-    return "3.2.0-beta.2";
+    return "3.2.0-beta.3";
   }
 
   /// Get SDK platform version.
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: stack_appodeal_flutter
 description: Official Flutter plugin to support Appodeal SDK for Android and iOS platforms. Support Consent Dialog for GDPR/CCPA zone.
-version: 3.2.0-beta.2
+version: 3.2.0-beta.3
 homepage: https://github.com/appodeal
 repository: https://github.com/appodeal/Appodeal-Flutter-Plugin
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"`
`28`	`28`
`29`	`29`	`android {`
`30`	`30`	`compileSdk 33`
	`31`	`+ namespace 'com.appodeal.appodeal_flutter_example'`
`31`	`32`
`32`	`33`	`defaultConfig {`
`33`	`34`	`minSdk 21`
`@@ -62,7 +63,7 @@ flutter {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`dependencies {`
`65`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
	`66`	`+ implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version"))`
`66`	`67`	`// Appodeal SDK 3.2.0.1-beta.2`
`67`	`68`	`implementation 'com.appodeal.ads:sdk:3.2.0.1-beta.2'`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.7.20'`
	`2`	`+ ext.kotlin_version = '1.8.10'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.3.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.1.4'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`classpath 'com.google.gms:google-services:4.4.0'`
`12`	`12`	`}`