diff --git a/.github/workflows/bob.yml b/.github/workflows/bob.yml index 7f9fb75..f15cca2 100644 --- a/.github/workflows/bob.yml +++ b/.github/workflows/bob.yml @@ -18,7 +18,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v3 with: - java-version: '17.0.5+8' + java-version: '21.0.5+11.0.LTS' + architecture: x64 distribution: 'temurin' - name: Get Defold version @@ -51,7 +52,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v3 with: - java-version: '17.0.5+8' + java-version: '21.0.5+11.0.LTS' + architecture: x64 distribution: 'temurin' - name: Get Defold version diff --git a/.gitignore b/.gitignore index e143b1f..9f2cd54 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ google-services.xml dependencies.json GoogleService-Info.plist Info.plist +/.editor_settings \ No newline at end of file diff --git a/example/example.collection b/example/example.collection index 834dcd9..90837ba 100644 --- a/example/example.collection +++ b/example/example.collection @@ -5,35 +5,40 @@ embedded_instances { data: "components {\n" " id: \"example\"\n" " component: \"/example/example.script\"\n" + "}\n" + "embedded_components {\n" + " id: \"sprite\"\n" + " type: \"sprite\"\n" + " data: \"default_animation: \\\"logo_256\\\"\\n" + "material: \\\"/builtins/materials/sprite.material\\\"\\n" + "textures {\\n" + " sampler: \\\"texture_sampler\\\"\\n" + " texture: \\\"/example/logo.atlas\\\"\\n" + "}\\n" + "\"\n" + "}\n" + "embedded_components {\n" + " id: \"label\"\n" + " type: \"label\"\n" + " data: \"size {\\n" + " x: 280.0\\n" + " y: 32.0\\n" + "}\\n" + "line_break: true\\n" + "font: \\\"/builtins/fonts/default.font\\\"\\n" + "material: \\\"/builtins/fonts/label-df.material\\\"\\n" + "\"\n" " position {\n" - " x: 0.0\n" - " y: 0.0\n" - " z: 0.0\n" - " }\n" - " rotation {\n" - " x: 0.0\n" - " y: 0.0\n" - " z: 0.0\n" - " w: 1.0\n" + " y: -508.0\n" " }\n" - " property_decls {\n" + " scale {\n" + " x: 2.0\n" + " y: 2.0\n" " }\n" "}\n" "" position { - x: 0.0 - y: 0.0 - z: 0.0 - } - rotation { - x: 0.0 - y: 0.0 - z: 0.0 - w: 1.0 - } - scale3 { - x: 1.0 - y: 1.0 - z: 1.0 + x: 320.0 + y: 839.0 } } diff --git a/example/example.script b/example/example.script index f9d5917..82dcbc8 100644 --- a/example/example.script +++ b/example/example.script @@ -1,3 +1,14 @@ +local function log(...) + print(...) + local text = label.get_text("#label") + text = text .. "\n" + local args = {...} + for i, v in ipairs(args) do + text = text .. v + end + label.set_text("#label", text) +end + function init(self) if firebase then firebase.set_callback(function(self, message_id, message) @@ -5,11 +16,11 @@ function init(self) firebase.get_installation_auth_token() firebase.get_installation_id() elseif message_id == firebase.MSG_INSTALLATION_ID then - print("id:", message.id) + log("id:", message.id) elseif message_id == firebase.MSG_INSTALLATION_AUTH_TOKEN then - print("token:", message.token) + log("token:", message.token) elseif message_id == firebase.MSG_ERROR then - print("ERROR:", message.error) + log("ERROR:", message.error) end end) firebase.initialize() diff --git a/example/logo.atlas b/example/logo.atlas new file mode 100644 index 0000000..a619f81 --- /dev/null +++ b/example/logo.atlas @@ -0,0 +1,4 @@ +images { + image: "/builtins/assets/images/logo/logo_256.png" +} +extrude_borders: 2 diff --git a/firebase/manifests/ios/Podfile b/firebase/manifests/ios/Podfile index 87e8513..e229057 100644 --- a/firebase/manifests/ios/Podfile +++ b/firebase/manifests/ios/Podfile @@ -1,4 +1,4 @@ -platform :ios '11.0' +platform :ios '13.0' -pod 'FirebaseCore', '10.22.0' -pod 'FirebaseInstallations', '10.22.0' +pod 'FirebaseCore', '11.15.0' +pod 'FirebaseInstallations', '11.15.0'