Pimple Popper v1.7

Crazy-Marvin · Mar 9, 2024 · bfef1b4 · bfef1b4
1 parent 4853898
commit bfef1b4
Show file tree

Hide file tree

Showing 46 changed files with 15,304 additions and 597 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Game.gd b/Game.gd
@@ -1,8 +1,9 @@
 extends Node
-
+onready var yodo1mas = $Yodo1Mas
 onready var _animation = $AnimationPlayer
 onready var _finish_popup = $finish_game_popup
 
+onready var debug_out = $CanvasLayer/Orange/DebugOut
 # shows what tools can be used with each body part.
 export(Dictionary) var tools_per_type:Dictionary
 
@@ -16,7 +17,6 @@ func _ready():
 	for bp in nodes:
 		bp.connect("bodypart_cleaned", self, "_on_bodypart_cleaned")
 	_animation.play("fade_out")
-
 	_hints = get_tree().get_nodes_in_group("hint")
 	hide_hints(hint_hided)
 #	yield(get_tree(), "idle_frame")
@@ -27,7 +27,7 @@ func _ready():
 			continue
 		b.visible = tools_per_type[Global.type].has(b.name)
 
-	Yodo.load_interstitial_ads()
+	#Yodo.load_interstitial_ads()
 
 func hide_hints(hided: bool) -> void:
 	for h in _hints:
@@ -94,13 +94,14 @@ func _on_animation_finished(anim: String) -> void:
 
 func _on_hint_pressed():
 	hint_hided = not hint_hided
+	yodo1mas.show_interstitial_ad()
 	hide_hints(hint_hided)
 
 
 func _on_anim_finished(finish_type):
 	if finish_type == _finish_popup.finish_type.WIN:
-		Yodo.show_interstitial_ad()
-		yield(Yodo, "interstitial_ad_closed")
+		yodo1mas.show_interstitial_ad()
+		yield(yodo1mas, "interstitial_ad_closed")
 		get_tree().change_scene("res://menu/main_screen.tscn")
 
 func _input(event):
@@ -111,3 +112,65 @@ func _on_scroll_gui_input(event):
 	if event is InputEventScreenTouch:
 		print ("_gui_event scroll...")
 	pass # Replace with function body.
+# callbacks	from signals
+
+func _on_Yodo1Mas_banner_ad_loaded():
+	debug_out.text = debug_out.text + "Banner loaded\n"
+
+func _on_Yodo1Mas_banner_failed_ad_loaded():
+	debug_out.text = debug_out.text + "Banner not loaded\n"
+func _on_Yodo1Mas_banner_ad_opened():
+	#add_coins(5)
+	debug_out.text = debug_out.text + "Banner opened\n"
+
+func _on_Yodo1Mas_banner_ad_failed_opened():
+	#add_coins(5)
+	debug_out.text = debug_out.text + "Banner not opened\n"
+
+func _on_Yodo1Mas_banner_ad_closed():
+	debug_out.text = debug_out.text + "Banner closed\n"
+
+
+
+
+func _on_Yodo1Mas_interstitial_ad_loaded():
+	debug_out.text = debug_out.text + "Interstitial  loaded\n"
+
+func _on_Yodo1Mas_interstitial_ad_not_loaded():
+	yodo1mas.load_interstitial_ads()
+	debug_out.text = debug_out.text + "Interstitial not loaded\n"
+
+func _on_Yodo1Mas_interstitial_ad_opened():
+	debug_out.text = debug_out.text + "Interstitial opened\n"
+
+func _on_Yodo1Mas_interstitial_ad_failed_to_opened():
+	yodo1mas.load_interstitial_ads()
+	debug_out.text = debug_out.text + "Interstitial not opened\n"
+
+func _on_Yodo1Mas_interstitial_ad_closed():
+	yodo1mas.load_interstitial_ads()
+	#add_coins(10)
+	debug_out.text = debug_out.text + "Interstitial closed\n"
+
+
+
+func _on_Yodo1Mas_rewarded_ad_loaded():
+	debug_out.text = debug_out.text + "Rewarded video  loaded\n"
+
+func _on_Yodo1Mas_rewarded_ad_not_loaded():
+	yodo1mas.load_rewarded_ad()
+	debug_out.text = debug_out.text + "Rewarded video not loaded\n"
+
+func _on_Yodo1Mas_rewarded_ad_opened():
+	debug_out.text = debug_out.text + "Rewarded video opened\n"
+
+func _on_Yodo1Mas_rewarded_ad_failed_opened():
+	yodo1mas.load_rewarded_ad()
+	debug_out.text = debug_out.text + "Rewarded video not opened\n"
+func _on_Yodo1Mas_rewarded_ad_closed():
+	yodo1mas.load_rewarded_ad()
+	debug_out.text = debug_out.text + "Rewarded video closed\n"
+
+func _on_Yodo1Mas_rewarded_ad_earned():
+	#add_coins(15)
+	debug_out.text = debug_out.text + "Rewarded video earned\n"
diff --git a/Global.gd b/Global.gd
@@ -115,7 +115,7 @@ var _window_project_size: Vector2
 var relative_screen_size_x: float
 
 var player_data: Dictionary = {
-	'is_add_active': true
+	'is_add_active': false
 }
 
 func _ready():

diff --git a/android/.DS_Store b/android/.DS_Store
diff --git a/android/.build_version b/android/.build_version
@@ -1 +1 @@
-3.5.1.stable
+3.5.3.stable
diff --git a/android/build/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/build/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/build/.gradle/buildOutputCleanup/cache.properties b/android/build/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sun Nov 20 17:57:20 COT 2022
-gradle.version=7.2
+#Mon Mar 04 17:46:01 PKT 2024
+gradle.version=7.4.2
diff --git a/android/build/.gradle/buildOutputCleanup/outputFiles.bin b/android/build/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/android/build/AndroidManifest.xml b/android/build/AndroidManifest.xml
@@ -27,7 +27,8 @@
     <!-- 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 tools:replace="android:allowBackup,android:label" android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:requestLegacyExternalStorage="false" android:icon="@mipmap/icon">
+    <application android:label="@string/godot_project_name_string" android:allowBackup="false" android:isGame="true" android:hasFragileUserData="false" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon">
+
         <!-- Records the version of the Godot editor used for building -->
         <meta-data
             android:name="org.godotengine.editor.version"
@@ -41,10 +42,6 @@
             android:name="xr_mode_metadata_name"
             android:value="xr_mode_metadata_value" />
 
-        <meta-data
-			android:name="com.google.android.gms.ads.APPLICATION_ID"
-			android:value="ca-app-pub-4973750815225055~4827496363"/>
-
         <!-- XR hand tracking metadata -->
         <!-- This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
         <!-- Removed at export time if the xr mode is not VR or hand tracking is disabled. -->
@@ -59,6 +56,9 @@
             android:name="xr_hand_tracking_version_name"
             android:value="xr_hand_tracking_version_value"/>
 
+ <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-4973750815225055~4827496363"/>
         <!-- Supported Meta devices -->
         <!-- This is removed by the exporter if the xr mode is not VR. -->
         <meta-data

diff --git a/android/build/build.gradle b/android/build/build.gradle
@@ -30,13 +30,13 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://android-sdk.is.com" }
-        maven { url "https://artifact.bytedance.com/repository/pangle" }
-        maven { url "https://sdk.tapjoy.com/" } 
-        maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
 
+maven { url "https://artifact.bytedance.com/repository/pangle" }
+maven { url "https://android-sdk.is.com" }
+maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
+maven { url "https://artifactory.bidmachine.io/bidmachine" }
         // Godot user plugins custom maven repos
         String[] mavenRepos = getGodotPluginsMavenRepos()
         if (mavenRepos != null && mavenRepos.size() > 0) {
@@ -123,8 +123,7 @@ android {
         versionName getExportVersionName()
         minSdkVersion getExportMinSdkVersion()
         targetSdkVersion getExportTargetSdkVersion()
-        multiDexEnabled true
-
+
         missingDimensionStrategy 'products', 'template'
 //CHUNK_ANDROID_DEFAULTCONFIG_BEGIN
 //CHUNK_ANDROID_DEFAULTCONFIG_END

diff --git a/android/build/build/generated/source/buildConfig/release/com/godot/game/BuildConfig.java b/android/build/build/generated/source/buildConfig/release/com/godot/game/BuildConfig.java
@@ -5,8 +5,8 @@
 
 public final class BuildConfig {
   public static final boolean DEBUG = false;
-  public static final String APPLICATION_ID = "org.godotengine.pimples";
+  public static final String APPLICATION_ID = "rocks.poopjournal.pimplepopper";
   public static final String BUILD_TYPE = "release";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
+  public static final int VERSION_CODE = 18;
+  public static final String VERSION_NAME = "1.7";
 }
diff --git a/...id/build/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar b/...id/build/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar
diff --git a/android/build/build/intermediates/incremental/mergeReleaseAssets/merger.xml b/android/build/build/intermediates/incremental/mergeReleaseAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/assets"/><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/release/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="com.pangle.global:metasec_pgl:1.0.0.4-rc.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/e6d8cb536f0920edbf21c3ab019a8b4a/transformed/jetified-metasec_pgl-1.0.0.4-rc.2/assets"><file name="cid" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/e6d8cb536f0920edbf21c3ab019a8b4a/transformed/jetified-metasec_pgl-1.0.0.4-rc.2/assets/cid"/></source></dataSet><dataSet config="com.mbridge.msdk.oversea:dycreator:16.5.91" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/b0da1c5cdafe4a00007a3595783f3170/transformed/jetified-dycreator-16.5.91/assets"><file name="rv_binddatas.xml" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/b0da1c5cdafe4a00007a3595783f3170/transformed/jetified-dycreator-16.5.91/assets/rv_binddatas.xml"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.gam:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/4d2a42cb51164332f82b41c679692bb7/transformed/jetified-ads.networks.gam-2.4.1.2/assets"><file name="bm_networks/gam.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/4d2a42cb51164332f82b41c679692bb7/transformed/jetified-ads.networks.gam-2.4.1.2/assets/bm_networks/gam.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.a4g:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/668274f710b0990b216025440d865a05/transformed/jetified-ads.networks.a4g-2.4.1.2/assets"><file name="bm_networks/a4g.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/668274f710b0990b216025440d865a05/transformed/jetified-ads.networks.a4g-2.4.1.2/assets/bm_networks/a4g.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.appodeal_gam:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/51bc35c2663f02c4fe615e38a4ea25a5/transformed/jetified-ads.networks.appodeal_gam-2.4.1.2/assets"><file name="bm_networks/appodeal_gam.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/51bc35c2663f02c4fe615e38a4ea25a5/transformed/jetified-ads.networks.appodeal_gam-2.4.1.2/assets/bm_networks/appodeal_gam.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.notsy:2.4.1.8" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/62e9859c37ada09ac20300e9ba9303f6/transformed/jetified-ads.networks.notsy-2.4.1.8/assets"><file name="bm_networks/notsy.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/62e9859c37ada09ac20300e9ba9303f6/transformed/jetified-ads.networks.notsy-2.4.1.8/assets/bm_networks/notsy.bmnetwork"/></source></dataSet><dataSet config="com.fyber:marketplace-sdk:8.2.5" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets"><file name="fyb_iframe_endcard_tmpl.html" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/fyb_iframe_endcard_tmpl.html"/><file name="fyb_static_endcard_tmpl.html" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/fyb_static_endcard_tmpl.html"/><file name="ia_mraid_bridge.txt" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/ia_mraid_bridge.txt"/><file name="ia_js_load_monitor.txt" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/ia_js_load_monitor.txt"/></source></dataSet><dataSet config="com.facebook.android:audience-network-sdk:6.16.0" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/9721076451ba624411ad9cc19fef361b/transformed/jetified-audience-network-sdk-6.16.0/assets"><file name="audience_network.dex" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/9721076451ba624411ad9cc19fef361b/transformed/jetified-audience-network-sdk-6.16.0/assets/audience_network.dex"/></source></dataSet><dataSet config="com.amazon.android:aps-sdk:9.8.8" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets"><file name="aps-mraid.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/aps-mraid.js"/><file name="aps_mobile_client_config.json" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/aps_mobile_client_config.json"/><file name="dtb-m.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/dtb-m.js"/><file name="omsdk-v1.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/omsdk-v1.js"/></source></dataSet><dataSet config="com.pangle.global:ads-sdk:5.7.0.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/7bf10bf3152a4878c19727c0078bdbb5/transformed/jetified-ads-sdk-5.7.0.2/assets"><file name="tt_mime_type.pro" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/7bf10bf3152a4878c19727c0078bdbb5/transformed/jetified-ads-sdk-5.7.0.2/assets/tt_mime_type.pro"/></source></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/assets"/><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/release/assets"/></dataSet></merger>
diff --git a/android/build/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/android/build/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/libs/release"><file name="godot-lib.release.aar" path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/libs/release/godot-lib.release.aar"/></source></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/libs/release"><file name="godot-lib.release.aar" path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/libs/release/godot-lib.release.aar"/></source></dataSet></merger>
diff --git a/android/build/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/android/build/build/intermediates/incremental/mergeReleaseShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/release/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/release/shaders"/></dataSet></merger>
diff --git a/android/build/build/intermediates/incremental/release-mergeJavaRes/merge-state b/android/build/build/intermediates/incremental/release-mergeJavaRes/merge-state