version 2.4.0, support for godot 4.0+

dorin-ga · dorin-ga · commit 50dca8be7c35 · 2023-08-28T16:33:34.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,19 @@
 /builds
 .project
 .settings
+
+# Godot 4+ specific ignores
+.godot/
+
+# Godot-specific ignores
+.import/
+export.cfg
+export_presets.cfg
+
+# Imported translations (automatically generated from CSV files)
+*.translation
+
+# Mono-specific ignores
+.mono/
+data_*/
+mono_crash.*.json
diff --git a/README.md b/README.md
@@ -12,11 +12,14 @@ If you have any issues or feedback regarding the SDK, please contact our friendl
 > The Godot SDK include support for **iOS**, **Android**, **Web**, **Windows**, **Mac** and **Linux** platforms
 >
 > Requirements:
-> * **Godot:** 3.1+  &nbsp;
+> * **Godot:** 4.0+  &nbsp;
 
 Changelog
 ---------
 <!--(CHANGELOG_TOP)-->
+**2.4.0**
+* support for godot 4.0+
+
 **2.3.5**
 * small fix for android dependencies for nativelib
 
diff --git a/android_godot_3_2/godotgameanalytics/src/main/java/com/gameanalytics/godotgameanalytics/GodotGameAnalytics.java b/android_godot_3_2/godotgameanalytics/src/main/java/com/gameanalytics/godotgameanalytics/GodotGameAnalytics.java
@@ -22,7 +22,7 @@
 public class GodotGameAnalytics extends GodotPlugin
 {
     private Activity activity = null;
-    private static final String VERSION = "godot 2.3.5";
+    private static final String VERSION = "godot 2.4.0";
 
     public GodotGameAnalytics(Godot godot)
     {
diff --git a/example/main_scene.gd b/example/main_scene.gd
@@ -1,10 +1,10 @@
 extends Node
-
-var GameAnalytics
+var ga
 const GAME_KEYS = {
 	"Android": "c6cfc80ff69d1e7316bf1e0c8194eda6",
-	"iOS"    : "c6cfc80ff69d1e7316bf1e0c8194eda6",
+	"iOS"    : "c6cfc 80ff69d1e7316bf1e0c8194eda6",
 	"OSX"    : "c6cfc80ff69d1e7316bf1e0c8194eda6",
+	"macOS"  : "c6cfc80ff69d1e7316bf1e0c8194eda6",
 	"Windows": "c6cfc80ff69d1e7316bf1e0c8194eda6",
 	"X11"    : "c6cfc80ff69d1e7316bf1e0c8194eda6",
 	"HTML5"  : "c6cfc80ff69d1e7316bf1e0c8194eda6"
@@ -13,7 +13,7 @@ const GAME_KEYS = {
 const SECRET_KEYS = {
 	"Android": "e0ae4809f70e2fa96916c7060f417ae53895f18d",
 	"iOS"    : "e0ae4809f70e2fa96916c7060f417ae53895f18d",
-	"OSX"    : "e0ae4809f70e2fa96916c7060f417ae53895f18d",
+	"macOS"  : "e0ae4809f70e2fa96916c7060f417ae53895f18d",
 	"Windows": "e0ae4809f70e2fa96916c7060f417ae53895f18d",
 	"X11"    : "e0ae4809f70e2fa96916c7060f417ae53895f18d",
 	"HTML5"  : "e0ae4809f70e2fa96916c7060f417ae53895f18d"
@@ -22,28 +22,28 @@ const SECRET_KEYS = {
 var platform_os = OS.get_name()
 
 func _notification(what):
-	if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
-		GameAnalytics.onQuit()
+	if what == NOTIFICATION_WM_CLOSE_REQUEST :
+		ga.onQuit()
 
 func _ready():
 	if(Engine.has_singleton("GameAnalytics")):
-		GameAnalytics = Engine.get_singleton("GameAnalytics")
+		ga = Engine.get_singleton("GameAnalytics")
 
-		GameAnalytics.setEnabledInfoLog(true)
-		GameAnalytics.setEnabledVerboseLog(true)
+		ga.setEnabledInfoLog(true)
+		ga.setEnabledVerboseLog(true)
 
-		GameAnalytics.configureAvailableCustomDimensions01(["ninja", "samurai"])
-		GameAnalytics.configureAvailableCustomDimensions02(["whale", "dolphin"])
-		GameAnalytics.configureAvailableCustomDimensions03(["horde", "alliance"])
-		GameAnalytics.configureAvailableResourceCurrencies(["gold", "gems"])
-		GameAnalytics.configureAvailableResourceItemTypes(["boost", "lives"])
+		ga.configureAvailableCustomDimensions01(["ninja", "samurai"])
+		ga.configureAvailableCustomDimensions02(["whale", "dolphin"])
+		ga.configureAvailableCustomDimensions03(["horde", "alliance"])
+		ga.configureAvailableResourceCurrencies(["gold", "gems"])
+		ga.configureAvailableResourceItemTypes(["boost", "lives"])
 
-		GameAnalytics.configureBuild("0.1.0")
-		GameAnalytics.configureAutoDetectAppVersion(true)
-		GameAnalytics.configureUserId("my_custom_id")
+		ga.configureBuild("0.1.0")
+		ga.configureAutoDetectAppVersion(true)
+		ga.configureUserId("my_custom_id")
 
-		GameAnalytics.init(GAME_KEYS[platform_os], SECRET_KEYS[platform_os])
-	get_node("Button").connect("pressed", self, "_on_Button_pressed")
+		ga.init(GAME_KEYS[platform_os], SECRET_KEYS[platform_os])
+	get_node("Button").connect("pressed", Callable(self, "_on_Button_pressed"))
 
 
 func _on_Button_pressed():
diff --git a/example/main_scene.tscn b/example/main_scene.tscn
@@ -1,14 +1,11 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://d0b8khwq65mkc"]
 
-[ext_resource path="res://main_scene.gd" type="Script" id=1]
+[ext_resource type="Script" path="res://main_scene.gd" id="1"]
 
 [node name="Node" type="Node"]
-script = ExtResource( 1 )
-__meta__ = {
-"__editor_plugin_screen__": "Script"
-}
+script = ExtResource("1")
 
 [node name="Button" type="Button" parent="."]
-margin_right = 270.0
-margin_bottom = 152.0
+offset_right = 270.0
+offset_bottom = 152.0
 text = "GA"
diff --git a/example/project.godot b/example/project.godot
@@ -6,21 +6,17 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
-
-_global_script_classes=[  ]
-_global_script_class_icons={
-
-}
+config_version=5
 
 [application]
 
 config/name="testGameAnalytics"
 run/main_scene="res://main_scene.tscn"
+config/features=PackedStringArray("4.2")
 config/icon="res://icon.png"
 
 [display]
 
-window/handheld/orientation="sensor"
 window/stretch/mode="viewport"
 window/stretch/aspect="keep_height"
+window/handheld/orientation="sensor"
diff --git a/gameanalytics/GameAnalytics.cpp b/gameanalytics/GameAnalytics.cpp
@@ -1,5 +1,5 @@
 #include "GameAnalytics.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 #if __EMSCRIPTEN__
 #define WEB_PLATFORM
@@ -24,7 +24,7 @@
 #include "cpp/src/GameAnalyticsExtern.h"
 #endif
 
-#define VERSION "godot 2.3.5"
+#define VERSION "godot 2.4.0"
 
 GameAnalytics *GameAnalytics::instance = NULL;
 
@@ -47,7 +47,7 @@ GameAnalytics::~GameAnalytics()
    }
 }
 
-void GameAnalytics::configureAvailableCustomDimensions01(const PoolStringArray &customDimensions)
+void GameAnalytics::configureAvailableCustomDimensions01(const PackedStringArray &customDimensions)
 {
 #if defined(IOS_PLATFORM)
     GameAnalyticsCpp::configureAvailableCustomDimensions01(customDimensions);
@@ -97,7 +97,7 @@ void GameAnalytics::configureAvailableCustomDimensions01(const PoolStringArray &
 #endif
 }
 
-void GameAnalytics::configureAvailableCustomDimensions02(const PoolStringArray &customDimensions)
+void GameAnalytics::configureAvailableCustomDimensions02(const PackedStringArray &customDimensions)
 {
 #if defined(IOS_PLATFORM)
     GameAnalyticsCpp::configureAvailableCustomDimensions02(customDimensions);
@@ -147,7 +147,7 @@ void GameAnalytics::configureAvailableCustomDimensions02(const PoolStringArray &
 #endif
 }
 
-void GameAnalytics::configureAvailableCustomDimensions03(const PoolStringArray &customDimensions)
+void GameAnalytics::configureAvailableCustomDimensions03(const PackedStringArray &customDimensions)
 {
 #if defined(IOS_PLATFORM)
     GameAnalyticsCpp::configureAvailableCustomDimensions03(customDimensions);
@@ -197,7 +197,7 @@ void GameAnalytics::configureAvailableCustomDimensions03(const PoolStringArray &
 #endif
 }
 
-void GameAnalytics::configureAvailableResourceCurrencies(const PoolStringArray &resourceCurrencies)
+void GameAnalytics::configureAvailableResourceCurrencies(const PackedStringArray &resourceCurrencies)
 {
 #if defined(IOS_PLATFORM)
     GameAnalyticsCpp::configureAvailableResourceCurrencies(resourceCurrencies);
@@ -247,7 +247,7 @@ void GameAnalytics::configureAvailableResourceCurrencies(const PoolStringArray &
 #endif
 }
 
-void GameAnalytics::configureAvailableResourceItemTypes(const PoolStringArray &resourceItemTypes)
+void GameAnalytics::configureAvailableResourceItemTypes(const PackedStringArray &resourceItemTypes)
 {
 #if defined(IOS_PLATFORM)
     GameAnalyticsCpp::configureAvailableResourceItemTypes(resourceItemTypes);
@@ -523,7 +523,7 @@ void GameAnalytics::addResourceEvent(const Dictionary &options)
         else if(key == "amount")
         {
             const Variant* v = options.getptr(key);
-            if(v != NULL && (v->get_type() == Variant::Type::INT || v->get_type() == Variant::Type::REAL))
+            if(v != NULL && (v->get_type() == Variant::Type::INT || v->get_type() == Variant::Type::FLOAT))
             {
                 amount = *v;
             }
@@ -713,7 +713,7 @@ void GameAnalytics::addDesignEvent(const Dictionary &options)
         else if(key == "value")
         {
             const Variant* v = options.getptr(key);
-            if(v != NULL && (v->get_type() == Variant::Type::INT || v->get_type() == Variant::Type::REAL))
+            if(v != NULL && (v->get_type() == Variant::Type::INT || v->get_type() == Variant::Type::FLOAT))
             {
                 value = *v;
                 sendValue = true;
diff --git a/gameanalytics/GameAnalytics.h b/gameanalytics/GameAnalytics.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "core/reference.h"
-#include "core/variant.h"
+#include "core/object/ref_counted.h"
+#include "core/variant/variant.h"
 
 class GameAnalytics : public Object
 {
@@ -16,12 +16,12 @@ class GameAnalytics : public Object
     GameAnalytics();
     ~GameAnalytics();
 
-    void configureAvailableCustomDimensions01(const PoolStringArray &customDimensions);
-    void configureAvailableCustomDimensions02(const PoolStringArray &customDimensions);
-    void configureAvailableCustomDimensions03(const PoolStringArray &customDimensions);
+    void configureAvailableCustomDimensions01(const PackedStringArray &customDimensions);
+    void configureAvailableCustomDimensions02(const PackedStringArray &customDimensions);
+    void configureAvailableCustomDimensions03(const PackedStringArray &customDimensions);
 
-    void configureAvailableResourceCurrencies(const PoolStringArray &resourceCurrencies);
-    void configureAvailableResourceItemTypes(const PoolStringArray &resourceItemTypes);
+    void configureAvailableResourceCurrencies(const PackedStringArray &resourceCurrencies);
+    void configureAvailableResourceItemTypes(const PackedStringArray &resourceItemTypes);
 
     void configureBuild(const String &build);
     void configureAutoDetectAppVersion(bool flag);
diff --git a/gameanalytics/SCsub b/gameanalytics/SCsub
@@ -11,5 +11,5 @@ if env['platform'] == 'iphone':
     sources.append("ios/src/GameAnalyticsCpp.mm")
     module_env.add_source_files(env.modules_sources, sources)
 
-if env["platform"] == "windows" or env["platform"] == "osx" or env["platform"] == "x11" or env["platform"] == "javascript":
+if env["platform"] == "windows" or env["platform"] == "macos" or env["platform"] == "osx" or env["platform"] == "x11" or env["platform"] == "javascript":
     module_env.add_source_files(env.modules_sources, sources)
diff --git a/gameanalytics/android/src/GodotGameAnalytics.java b/gameanalytics/android/src/GodotGameAnalytics.java
@@ -15,7 +15,7 @@
 public class GodotGameAnalytics extends Godot.SingletonBase
 {
     private Activity activity = null;
-    private static final String VERSION = "godot 2.3.5";
+    private static final String VERSION = "godot 2.4.0";
 
     static public Godot.SingletonBase initialize(Activity activity)
     {
diff --git a/gameanalytics/config.py b/gameanalytics/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return platform == "iphone" or platform == "android" or platform == "windows" or platform == "osx" or platform == "x11" or platform == "javascript"
+    return platform == "iphone" or platform == "android" or platform == "windows" or platform == "osx" or platform == "macOS" or platform == "x11" or platform == "javascript"
 
 
 def configure(env):
@@ -39,7 +39,8 @@ def configure(env):
                 env.Append(LIBS=["GameAnalytics"])
             else:
                 env.Append(LINKFLAGS=["GameAnalytics.lib"])
-    elif env["platform"] == "osx":
+    elif env["platform"] == "osx" or env["platform"] == "macos":
+        print("here!!!")
         env.Append(LIBPATH=["#modules/gameanalytics/cpp/lib/osx"])
         env.Append(LIBS=["libGameAnalytics.dylib"])
         env.Append(RPATH=["."])
diff --git a/gameanalytics/register_types.cpp b/gameanalytics/register_types.cpp
@@ -1,18 +1,18 @@
 #include "register_types.h"
-#include "core/class_db.h"
-#include "core/engine.h"
+#include "core/object/class_db.h"
+#include "core/config/engine.h"
 #include "GameAnalytics.h"
 
 static GameAnalytics* GAPtr = NULL;
 
-void register_gameanalytics_types()
+void initialize_gameanalytics_module(ModuleInitializationLevel p_level)
 {
     ClassDB::register_class<GameAnalytics>();
     GAPtr = memnew(GameAnalytics);
     Engine::get_singleton()->add_singleton(Engine::Singleton("GameAnalytics", GameAnalytics::get_singleton()));
 }
 
-void unregister_gameanalytics_types()
+void uninitialize_gameanalytics_module(ModuleInitializationLevel p_level)
 {
     memdelete(GAPtr);
 }
diff --git a/gameanalytics/register_types.h b/gameanalytics/register_types.h
@@ -1,4 +1,6 @@
 #pragma once
 
-void register_gameanalytics_types();
-void unregister_gameanalytics_types();
+#include "modules/register_module_types.h"
+
+void initialize_gameanalytics_module(ModuleInitializationLevel p_level);
+void uninitialize_gameanalytics_module(ModuleInitializationLevel p_level);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`public class GodotGameAnalytics extends GodotPlugin`
`23`	`23`	`{`
`24`	`24`	`private Activity activity = null;`
`25`		`- private static final String VERSION = "godot 2.3.5";`
	`25`	`+ private static final String VERSION = "godot 2.4.0";`
`26`	`26`
`27`	`27`	`public GodotGameAnalytics(Godot godot)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include "GameAnalytics.h"`
`2`		`-#include "core/engine.h"`
	`2`	`+#include "core/config/engine.h"`
`3`	`3`
`4`	`4`	`#if __EMSCRIPTEN__`
`5`	`5`	`#define WEB_PLATFORM`
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include "cpp/src/GameAnalyticsExtern.h"`
`25`	`25`	`#endif`
`26`	`26`
`27`		`-#define VERSION "godot 2.3.5"`
	`27`	`+#define VERSION "godot 2.4.0"`
`28`	`28`
`29`	`29`	`GameAnalytics *GameAnalytics::instance = NULL;`
`30`	`30`
`@@ -47,7 +47,7 @@ GameAnalytics::~GameAnalytics()`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-void GameAnalytics::configureAvailableCustomDimensions01(const PoolStringArray &customDimensions)`
	`50`	`+void GameAnalytics::configureAvailableCustomDimensions01(const PackedStringArray &customDimensions)`
`51`	`51`	`{`
`52`	`52`	`#if defined(IOS_PLATFORM)`
`53`	`53`	`GameAnalyticsCpp::configureAvailableCustomDimensions01(customDimensions);`
`@@ -97,7 +97,7 @@ void GameAnalytics::configureAvailableCustomDimensions01(const PoolStringArray &`
`97`	`97`	`#endif`
`98`	`98`	`}`
`99`	`99`
`100`		`-void GameAnalytics::configureAvailableCustomDimensions02(const PoolStringArray &customDimensions)`
	`100`	`+void GameAnalytics::configureAvailableCustomDimensions02(const PackedStringArray &customDimensions)`
`101`	`101`	`{`
`102`	`102`	`#if defined(IOS_PLATFORM)`
`103`	`103`	`GameAnalyticsCpp::configureAvailableCustomDimensions02(customDimensions);`
`@@ -147,7 +147,7 @@ void GameAnalytics::configureAvailableCustomDimensions02(const PoolStringArray &`
`147`	`147`	`#endif`
`148`	`148`	`}`
`149`	`149`
`150`		`-void GameAnalytics::configureAvailableCustomDimensions03(const PoolStringArray &customDimensions)`
	`150`	`+void GameAnalytics::configureAvailableCustomDimensions03(const PackedStringArray &customDimensions)`
`151`	`151`	`{`
`152`	`152`	`#if defined(IOS_PLATFORM)`
`153`	`153`	`GameAnalyticsCpp::configureAvailableCustomDimensions03(customDimensions);`
`@@ -197,7 +197,7 @@ void GameAnalytics::configureAvailableCustomDimensions03(const PoolStringArray &`
`197`	`197`	`#endif`
`198`	`198`	`}`
`199`	`199`
`200`		`-void GameAnalytics::configureAvailableResourceCurrencies(const PoolStringArray &resourceCurrencies)`
	`200`	`+void GameAnalytics::configureAvailableResourceCurrencies(const PackedStringArray &resourceCurrencies)`
`201`	`201`	`{`
`202`	`202`	`#if defined(IOS_PLATFORM)`
`203`	`203`	`GameAnalyticsCpp::configureAvailableResourceCurrencies(resourceCurrencies);`
`@@ -247,7 +247,7 @@ void GameAnalytics::configureAvailableResourceCurrencies(const PoolStringArray &`
`247`	`247`	`#endif`
`248`	`248`	`}`
`249`	`249`
`250`		`-void GameAnalytics::configureAvailableResourceItemTypes(const PoolStringArray &resourceItemTypes)`
	`250`	`+void GameAnalytics::configureAvailableResourceItemTypes(const PackedStringArray &resourceItemTypes)`
`251`	`251`	`{`
`252`	`252`	`#if defined(IOS_PLATFORM)`
`253`	`253`	`GameAnalyticsCpp::configureAvailableResourceItemTypes(resourceItemTypes);`
`@@ -523,7 +523,7 @@ void GameAnalytics::addResourceEvent(const Dictionary &options)`
`523`	`523`	`else if(key == "amount")`
`524`	`524`	`{`
`525`	`525`	`const Variant* v = options.getptr(key);`
`526`		`- if(v != NULL && (v->get_type() == Variant::Type::INT \|\| v->get_type() == Variant::Type::REAL))`
	`526`	`+ if(v != NULL && (v->get_type() == Variant::Type::INT \|\| v->get_type() == Variant::Type::FLOAT))`
`527`	`527`	`{`
`528`	`528`	`amount = *v;`
`529`	`529`	`}`
`@@ -713,7 +713,7 @@ void GameAnalytics::addDesignEvent(const Dictionary &options)`
`713`	`713`	`else if(key == "value")`
`714`	`714`	`{`
`715`	`715`	`const Variant* v = options.getptr(key);`
`716`		`- if(v != NULL && (v->get_type() == Variant::Type::INT \|\| v->get_type() == Variant::Type::REAL))`
	`716`	`+ if(v != NULL && (v->get_type() == Variant::Type::INT \|\| v->get_type() == Variant::Type::FLOAT))`
`717`	`717`	`{`
`718`	`718`	`value = *v;`
`719`	`719`	`sendValue = true;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`public class GodotGameAnalytics extends Godot.SingletonBase`
`16`	`16`	`{`
`17`	`17`	`private Activity activity = null;`
`18`		`- private static final String VERSION = "godot 2.3.5";`
	`18`	`+ private static final String VERSION = "godot 2.4.0";`
`19`	`19`
`20`	`20`	`static public Godot.SingletonBase initialize(Activity activity)`
`21`	`21`	`{`