Skip to content

Commit 3056542

Browse files
committed
Add missing libs, fix build
1 parent 07ea76b commit 3056542

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+32657
-62
lines changed

.github/workflows/build.yaml

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,78 @@
1-
name: Build Android APK
2-
1+
name: Build APK
32
on:
43
push:
5-
branches: [dev]
4+
branches:
5+
- dev
66
pull_request:
7-
branches: [dev]
7+
branches:
8+
- dev
89
workflow_dispatch:
910

1011
jobs:
1112
build:
1213
runs-on: ubuntu-latest
1314

14-
env:
15-
SDK_VERSION: 34
16-
NDK_VERSION: 27.0.11718014
17-
MIN_SDK: 29
18-
1915
steps:
16+
# Check out the repository code with submodules
2017
- name: Checkout code
2118
uses: actions/checkout@v4
2219
with:
2320
submodules: recursive
2421

25-
- name: Setup Java
26-
uses: actions/setup-java@v3
22+
# Set up JDK 17
23+
- name: Set up JDK
24+
uses: actions/setup-java@v4
2725
with:
28-
distribution: "temurin"
2926
java-version: "17"
27+
distribution: "temurin"
3028

29+
# Install CMake 3.25.1
30+
- name: Install CMake
31+
run: |
32+
wget https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.sh
33+
chmod +x cmake-3.25.1-linux-x86_64.sh
34+
sudo ./cmake-3.25.1-linux-x86_64.sh --prefix=/usr/local --skip-license
35+
cmake --version
36+
37+
# Set up Android SDK and NDK
3138
- name: Setup Android SDK
3239
uses: android-actions/setup-android@v3
40+
with:
41+
cmdline-tools-version: "11076708"
42+
packages: "platforms;android-34 build-tools;34.0.0 ndk;27.2.12479018"
43+
accept-android-sdk-licenses: true
3344

34-
- name: Install NDK
45+
# Verify NDK and CMake versions
46+
- name: Verify NDK and CMake versions
3547
run: |
36-
sdkmanager "ndk;$NDK_VERSION"
37-
sdkmanager "cmake;3.22.1"
48+
cat $ANDROID_NDK_HOME/source.properties
49+
cmake --version
50+
51+
# Cache Gradle dependencies
52+
- name: Cache Gradle packages
53+
uses: actions/cache@v4
54+
with:
55+
path: |
56+
~/.gradle/caches
57+
~/.gradle/wrapper
58+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
59+
restore-keys: |
60+
${{ runner.os }}-gradle-
3861
39-
- name: Grant execute permission to Gradle wrapper
62+
# Grant execute permission for gradlew
63+
- name: Make gradlew executable
4064
run: chmod +x ./gradlew
4165

42-
- name: Build Debug APK
66+
# Build the APK
67+
- name: Build debug APK
4368
run: ./gradlew assembleDebug
69+
env:
70+
ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
71+
ANDROID_NDK_HOME: ${{ env.ANDROID_NDK_HOME }}
4472

45-
- name: Upload APK artifact
73+
# Upload the APK as an artifact
74+
- name: Upload APK
4675
uses: actions/upload-artifact@v4
4776
with:
48-
name: testgame-apk
77+
name: raymob-debug-apk
4978
path: app/build/outputs/apk/debug/app-debug.apk

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "libs/raymob"]
88
path = libs/raymob
99
url = https://github.com/Bigfoot71/raymob.git
10+
[submodule "libs/raylib"]
11+
path = libs/raylib
12+
url = https://github.com/raysan5/raylib.git

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
android {
66
namespace 'com.raylib.testgame'
77
compileSdk 34
8-
ndkVersion "27.1.12297006"
8+
ndkVersion "27.2.12479018"
99

1010
defaultConfig {
1111
applicationId "com.raylib.testgame"
@@ -36,7 +36,7 @@ android {
3636
externalNativeBuild {
3737
cmake {
3838
path "src/main/cpp/CMakeLists.txt"
39-
version "3.22.1" // Use CMake version compatible with NDK 27b
39+
version "3.25.1" // Use CMake version compatible with NDK 27c
4040
}
4141
}
4242

0 commit comments

Comments
 (0)