Skip to content

Commit

Permalink
Merge pull request #117 from Poing-Studios/format-version-admob
Browse files Browse the repository at this point in the history
fix: format version when it's `vX.Y.0` to `vX.Y`
  • Loading branch information
gumaciel authored Dec 3, 2023
2 parents 89b9ee7 + af48f6c commit f5648b6
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
10 changes: 9 additions & 1 deletion addons/admob/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
*.zip
*.zip

# Android
*.aar
*.gdap

# iOS
*.a
*.gdip
8 changes: 7 additions & 1 deletion addons/admob/admob.gd
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var plugin_version := PoingAdMobVersionHelper.get_plugin_version()

var version_support := {
"android": "v3.0.2",
"ios": "v3.0.2"
"ios": "v3.0.3"
}

enum Items {
Expand All @@ -59,6 +59,7 @@ class PoingAdMobEditorExportPlugin extends EditorExportPlugin:

var _exporter := PoingAdMobEditorExportPlugin.new()
func _enter_tree():
godot_version = _format_version(godot_version)
add_export_plugin(_exporter)

setup_timer()
Expand Down Expand Up @@ -99,6 +100,11 @@ func _exit_tree():
remove_export_plugin(_exporter)
remove_tool_menu_item("AdMob Download Manager")

func _format_version(version: String) -> String:
var pattern = RegEx.new()
pattern.compile("^(v\\d+\\.\\d+)(\\.0)$")
var match_result = pattern.search(version)
return match_result.get_string(1) if match_result else version

func _request_version_support():
var url = "https://raw.githubusercontent.com/Poing-Studios/godot-admob-versions/" + plugin_version + "/versions.json"
Expand Down
2 changes: 1 addition & 1 deletion addons/admob/plugin.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
name="AdMob"
description="The AdMob Plugin for Android and iOS."
author="Poing Studios"
version="v3.0.2"
version="v3.0.3"
script="admob.gd"
2 changes: 1 addition & 1 deletion addons/admob/version_helper.gd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static var version_formated : String = _get_plugin_version_formated() :

static func get_plugin_version() -> String:
var plugin_config_file := ConfigFile.new()
var version: String = "v3.0.1" #redundancy
var version: String = "v3.0.3" #redundancy

if plugin_config_file.load("res://addons/admob/plugin.cfg") == OK:
version = plugin_config_file.get_value("plugin", "version")
Expand Down

0 comments on commit f5648b6

Please sign in to comment.