Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- update to gradle 8, add namespace in example #24

Merged
merged 6 commits into from
May 26, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v1
with:
java-version: 11.0
java-version: 17.0

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 7.5.1
gradle-version: 8.0.2

- name: Build example
run: |
Expand Down
6 changes: 5 additions & 1 deletion android_studio/_preload.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ function create_gradle_wrapper(wks)
-- create gradle wrapper
if wks.gradlewrapper then
gradle = "// auto-generated by premake-android-studio\n"
local count = 0
for _, item in ipairs(wks.gradlewrapper) do
gradle = (gradle .. item .. "\n")
count = count + 1
end
if count > 0 then
io.writefile(wks.location .. "/gradle/wrapper/gradle-wrapper.properties", gradle)
end
io.writefile(wks.location .. "/gradle/wrapper/gradle-wrapper.properties", gradle)
end
end

Expand Down
11 changes: 9 additions & 2 deletions example/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@ require "android_studio"

workspace "android_studio_example"
configurations { "Debug", "Release" }
gradleversion "com.android.tools.build:gradle:7.0.0"
gradleversion "com.android.tools.build:gradle:8.0.2"
location ("build")

assetpacks
{
["pack"] = "install-time",
}

androidnamespace "premake.andoid.studio"

gradlewrapper {
"distributionUrl=https://services.gradle.org/distributions/gradle-8.0.2-bin.zip"
}

project "android_studio_example"
kind "ConsoleApp"
language "C++"
Expand All @@ -22,7 +28,8 @@ project "android_studio_example"
{
"cpp/**.*",
"java/**.*",
"manifest/**.*"

-- "manifest/**.*"
}

links
Expand Down
Loading