Skip to content

Commit 3afba87

Browse files
authored
Update Firebase SDK on ios to 11.15.0 (#21)
* update ios to 11.15.0 * update java on CI
1 parent 075c27e commit 3afba87

File tree

6 files changed

+55
-32
lines changed

6 files changed

+55
-32
lines changed

.github/workflows/bob.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: actions/setup-java@v3
2020
with:
21-
java-version: '17.0.5+8'
21+
java-version: '21.0.5+11.0.LTS'
22+
architecture: x64
2223
distribution: 'temurin'
2324

2425
- name: Get Defold version
@@ -51,7 +52,8 @@ jobs:
5152
- uses: actions/checkout@v2
5253
- uses: actions/setup-java@v3
5354
with:
54-
java-version: '17.0.5+8'
55+
java-version: '21.0.5+11.0.LTS'
56+
architecture: x64
5557
distribution: 'temurin'
5658

5759
- name: Get Defold version

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ google-services.xml
1414
dependencies.json
1515
GoogleService-Info.plist
1616
Info.plist
17+
/.editor_settings

example/example.collection

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,40 @@ embedded_instances {
55
data: "components {\n"
66
" id: \"example\"\n"
77
" component: \"/example/example.script\"\n"
8+
"}\n"
9+
"embedded_components {\n"
10+
" id: \"sprite\"\n"
11+
" type: \"sprite\"\n"
12+
" data: \"default_animation: \\\"logo_256\\\"\\n"
13+
"material: \\\"/builtins/materials/sprite.material\\\"\\n"
14+
"textures {\\n"
15+
" sampler: \\\"texture_sampler\\\"\\n"
16+
" texture: \\\"/example/logo.atlas\\\"\\n"
17+
"}\\n"
18+
"\"\n"
19+
"}\n"
20+
"embedded_components {\n"
21+
" id: \"label\"\n"
22+
" type: \"label\"\n"
23+
" data: \"size {\\n"
24+
" x: 280.0\\n"
25+
" y: 32.0\\n"
26+
"}\\n"
27+
"line_break: true\\n"
28+
"font: \\\"/builtins/fonts/default.font\\\"\\n"
29+
"material: \\\"/builtins/fonts/label-df.material\\\"\\n"
30+
"\"\n"
831
" position {\n"
9-
" x: 0.0\n"
10-
" y: 0.0\n"
11-
" z: 0.0\n"
12-
" }\n"
13-
" rotation {\n"
14-
" x: 0.0\n"
15-
" y: 0.0\n"
16-
" z: 0.0\n"
17-
" w: 1.0\n"
32+
" y: -508.0\n"
1833
" }\n"
19-
" property_decls {\n"
34+
" scale {\n"
35+
" x: 2.0\n"
36+
" y: 2.0\n"
2037
" }\n"
2138
"}\n"
2239
""
2340
position {
24-
x: 0.0
25-
y: 0.0
26-
z: 0.0
27-
}
28-
rotation {
29-
x: 0.0
30-
y: 0.0
31-
z: 0.0
32-
w: 1.0
33-
}
34-
scale3 {
35-
x: 1.0
36-
y: 1.0
37-
z: 1.0
41+
x: 320.0
42+
y: 839.0
3843
}
3944
}

example/example.script

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1+
local function log(...)
2+
print(...)
3+
local text = label.get_text("#label")
4+
text = text .. "\n"
5+
local args = {...}
6+
for i, v in ipairs(args) do
7+
text = text .. v
8+
end
9+
label.set_text("#label", text)
10+
end
11+
112
function init(self)
213
if firebase then
314
firebase.set_callback(function(self, message_id, message)
415
if message_id == firebase.MSG_INITIALIZED then
516
firebase.get_installation_auth_token()
617
firebase.get_installation_id()
718
elseif message_id == firebase.MSG_INSTALLATION_ID then
8-
print("id:", message.id)
19+
log("id:", message.id)
920
elseif message_id == firebase.MSG_INSTALLATION_AUTH_TOKEN then
10-
print("token:", message.token)
21+
log("token:", message.token)
1122
elseif message_id == firebase.MSG_ERROR then
12-
print("ERROR:", message.error)
23+
log("ERROR:", message.error)
1324
end
1425
end)
1526
firebase.initialize()

example/logo.atlas

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
images {
2+
image: "/builtins/assets/images/logo/logo_256.png"
3+
}
4+
extrude_borders: 2

firebase/manifests/ios/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios '11.0'
1+
platform :ios '13.0'
22

3-
pod 'FirebaseCore', '10.22.0'
4-
pod 'FirebaseInstallations', '10.22.0'
3+
pod 'FirebaseCore', '11.15.0'
4+
pod 'FirebaseInstallations', '11.15.0'

0 commit comments

Comments
 (0)