Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/bob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -51,7 +52,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
java-version: '17.0.5+8'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

outdated java version

java-version: '21.0.5+11.0.LTS'
architecture: x64
distribution: 'temurin'

- name: Get Defold version
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ google-services.xml
dependencies.json
GoogleService-Info.plist
Info.plist
/.editor_settings
53 changes: 29 additions & 24 deletions example/example.collection
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
17 changes: 14 additions & 3 deletions example/example.script
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

print logs on the screen. It makes it easier to test


function init(self)
if firebase then
firebase.set_callback(function(self, message_id, message)
if message_id == firebase.MSG_INITIALIZED then
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()
Expand Down
4 changes: 4 additions & 0 deletions example/logo.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
images {
image: "/builtins/assets/images/logo/logo_256.png"
}
extrude_borders: 2
6 changes: 3 additions & 3 deletions firebase/manifests/ios/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this update increase minimum iOS version to 13.0

Loading