Merge remote-tracking branch 'origin/develop'

demo/.gitignore

@@ -1,2 +1,3 @@
+/build/
 /.import/
-/.mono/
+/privacy.cfg

demo/android/.build_version

@@ -1 +1 @@
-3.2.3.stable.mono
+3.2.3.stable

demo/android/build/AndroidManifest.xml

@@ -27,9 +27,7 @@
     <!-- Any tag in this line after android:icon will be erased when doing custom builds. -->
     <!-- If you want to add tags manually, do before it. -->
     <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
-    <application android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon">
-			android:networkSecurityConfig="@xml/network_security_config"
-		>
+    <application tools:replace="android:label" android:label="GodotYodo1Mas" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon">
 
         <!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
         <!-- Do these changes in the export preset. Adding new ones is fine. -->
@@ -46,7 +44,7 @@
 
 		<meta-data
 			android:name="com.google.android.gms.ads.APPLICATION_ID"
-			android:value="ca-app-pub-7188592076082444~5567931030"/>			
+			android:value="ca-app-pub-7188592076082444~9384775166"/>			
 
         <activity
             android:name=".GodotApp"

demo/android/build/build.gradle

@@ -31,6 +31,11 @@ allprojects {
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
 
+        maven { url "https://dl.bintray.com/ironsource-mobile/android-sdk" }
+        maven { url "https://dl.bintray.com/ironsource-mobile/android-adapters" }
+        maven { url "https://dl.bintray.com/yodo1/MAS-Android" }
+        maven { url "https://dl.bintray.com/yodo1/android-sdk" }
+
         // Godot user plugins custom maven repos
         String[] mavenRepos = getGodotPluginsMavenRepos()
         if (mavenRepos != null && mavenRepos.size() > 0) {
@@ -96,6 +101,7 @@ android {
         applicationId getExportPackageName()
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
+		multiDexEnabled true
 //CHUNK_ANDROID_DEFAULTCONFIG_BEGIN
 //CHUNK_ANDROID_DEFAULTCONFIG_END
     }

demo/android/build/config.gradle

@@ -1,7 +1,7 @@
 ext.versions = [
-    androidGradlePlugin: '3.5.3',
+    androidGradlePlugin: '3.6.0',
     compileSdk         : 29,
-    minSdk             : 18,
+    minSdk             : 19,
     targetSdk          : 29,
     buildTools         : '29.0.3',
     supportCoreUtils   : '1.0.0',

demo/android/plugins/GodotYodo1Mas.gdap

@@ -2,8 +2,8 @@
 
 name="GodotYodo1Mas"
 binary_type="local"
-binary="GodotYodo1Mas.1.0.0.debug.aar"
+binary="GodotYodo1Mas.1.0.0.release.aar"
 
 [dependencies]
 
-remote=["com.yodo1.mas:standard:4.0.1.0"]
+remote=["com.yodo1.mas:standard:4.0.1.1"]

demo/assets/ui/Yodo1_logo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Yodo1_logo.png-bcfe879979f1a3a50530c344f180debb.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/Yodo1_logo.png"
+dest_files=[ "res://.import/Yodo1_logo.png-bcfe879979f1a3a50530c344f180debb.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

demo/assets/ui/back.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/back.png-5ed809c61d6353c5701f867939dd5917.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/back.png"
+dest_files=[ "res://.import/back.png-5ed809c61d6353c5701f867939dd5917.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

demo/assets/ui/banner.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/banner.png-57b2756f6c24d74d2e06726a2c11d3c0.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/banner.png"
+dest_files=[ "res://.import/banner.png-57b2756f6c24d74d2e06726a2c11d3c0.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0