Skip to content

Commit 34a2380

Browse files
authored
Merge pull request #134 from urbanairship/MOBILE-3924
[MOBILE-3924] Update Unity plugin
2 parents 6da9c43 + 1c617e4 commit 34a2380

40 files changed

+5052
-103
lines changed

.github/workflows/ci.yaml

+16-7
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,32 @@ on: [pull_request]
55
jobs:
66
ci:
77
runs-on: ubuntu-latest
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
targetPlatform:
12+
- iOS # Build an iOS player.
13+
- Android # Build an Android .apk standalone app.
14+
815
steps:
916
- uses: actions/checkout@v2
1017

11-
- name: Set up JDK 1.8
12-
uses: actions/setup-java@v1
18+
- name: Set up JDK 11
19+
uses: actions/setup-java@v2
1320
with:
14-
java-version: 1.8
21+
distribution: 'temurin'
22+
java-version: '11'
1523

1624
- name: Build Docs
1725
run: |
1826
sudo apt-get install doxygen
1927
./gradlew docs:build
2028
21-
# Build
22-
- name: Build project
29+
- name: Build
30+
uses: game-ci/unity-builder@v4
2331
env:
24-
UNITY_USERNAME: ${{ secrets.ULRICH_UNITY_EMAIL }}
32+
UNITY_EMAIL: ${{ secrets.ULRICH_UNITY_EMAIL }}
2533
UNITY_PASSWORD: ${{ secrets.ULRICH_UNITY_PASSWORD }}
2634
UNITY_SERIAL: ${{ secrets.ULRICH_UNITY_SERIAL }}
27-
run: ./scripts/docker_run.sh
35+
with:
36+
targetPlatform: ${{ matrix.targetPlatform }}

.github/workflows/release.yaml

+11-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ on:
88
jobs:
99
plugin:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
targetPlatform:
15+
- iOS # Build an iOS player.
16+
- Android # Build an Android .apk standalone app.
17+
1118
steps:
1219
- uses: actions/checkout@v2
1320

@@ -32,11 +39,13 @@ jobs:
3239
echo ::set-output name=NOTES::"$NOTES"
3340
3441
- name: Build
42+
uses: game-ci/unity-builder@v4
3543
env:
36-
UNITY_USERNAME: ${{ secrets.ULRICH_UNITY_EMAIL }}
44+
UNITY_EMAIL: ${{ secrets.ULRICH_UNITY_EMAIL }}
3745
UNITY_PASSWORD: ${{ secrets.ULRICH_UNITY_PASSWORD }}
3846
UNITY_SERIAL: ${{ secrets.ULRICH_UNITY_SERIAL }}
39-
run: ./scripts/docker_run.sh
47+
with:
48+
targetPlatform: ${{ matrix.targetPlatform }}
4049

4150
- name: Create Github Release
4251
uses: actions/create-release@v1.0.1

.gitignore

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
[Ll]ibrary/
44
[Tt]emp/
55
[Oo]bj/
6+
[Ll]ogs/
7+
[Aa]rtifacts/
8+
[Cc]odeCoverage/
9+
Packages/packages-lock.json
10+
Assets/Editor/Editor/
11+
UserSettings/
612

713
*/bin/*
814
*/jar/*
@@ -16,5 +22,7 @@ reports/
1622
*.iml
1723
.idea/
1824
.gradle
19-
build/
20-
unity-classes.jar
25+
*/build/*
26+
!build/*.unitypackage
27+
unity-classes.jar
28+
*.meta

0 commit comments

Comments
 (0)