From 7590dc2111ec3a59d52b86ccd107bec2ef40bcfa Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Thu, 2 Jun 2022 17:25:30 +0200 Subject: [PATCH 1/5] Add test job --- .github/workflows/release.yaml | 5 ----- .github/workflows/test.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3598f5d..cdf16d4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,9 +5,6 @@ on: tags: - 'v*.*.*' -env: - BUILD_TYPE: Release - jobs: build: runs-on: ubuntu-latest @@ -27,8 +24,6 @@ jobs: - name: Build APKs run: ./gradlew -p ./app :app:assembleRelease - env: - GPR_TOKEN_READ: ${{ secrets.GPR_TOKEN_READ }} - name: Publish release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 0000000..7108d6d --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,30 @@ +name: Build App + +# Only pushes and PRs against the master branch are built +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + lfs: 'true' + + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Build APKs + run: ./gradlew -p ./app :app:assembleDebug + From 877353cb3090571bf710c3ba0f5c4a8ce6a99ec9 Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Thu, 2 Jun 2022 17:37:20 +0200 Subject: [PATCH 2/5] Update app to new Maven package --- app/build.gradle | 2 +- app/src/main/assets/G05.ramses | 4 ++-- app/src/main/assets/G05.rlogic | 4 ++-- content/digital-car-3d | 2 +- gradle.properties | 2 -- repositories.gradle | 8 -------- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0a6550d..05f838f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,5 +46,5 @@ dependencies { implementation 'com.google.android.material:material:1.1.0' implementation "androidx.navigation:navigation-fragment-ktx:2.2.1" implementation "androidx.navigation:navigation-ui-ktx:2.2.1" - implementation "com.bmwgroup.ramses:ramses-aar:1.0.0" + implementation "io.github.bmwcarit:ramses-aar:1.0.0" } diff --git a/app/src/main/assets/G05.ramses b/app/src/main/assets/G05.ramses index 8e451e5..8355b92 100644 --- a/app/src/main/assets/G05.ramses +++ b/app/src/main/assets/G05.ramses @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b12a4c1f57464a1fe6a441563854d2d4e971c34c35d7f5ec64018b71ab9b457 -size 23531501 +oid sha256:0a6c2db080341a465f8810dbba1992c96d1a1171e082a4227cc4d37dbb29396e +size 23403981 diff --git a/app/src/main/assets/G05.rlogic b/app/src/main/assets/G05.rlogic index 92c4607..1a00651 100644 --- a/app/src/main/assets/G05.rlogic +++ b/app/src/main/assets/G05.rlogic @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46ae5f0058741bf3b0c07e4de7c62a057735d28aeb931ede23dda23fac35b7a -size 145848 +oid sha256:4e582691abbf769abbb1315c17405845e3c662bc50c976860718e3fb5744f2e9 +size 156264 diff --git a/content/digital-car-3d b/content/digital-car-3d index 541aafa..3bf9b18 160000 --- a/content/digital-car-3d +++ b/content/digital-car-3d @@ -1 +1 @@ -Subproject commit 541aafa4d03a9d747817feb80b166984f204c129 +Subproject commit 3bf9b18d85987c7643e7aaebba0bd41635fe1e33 diff --git a/gradle.properties b/gradle.properties index ddc622f..a231ee9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,3 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -#gpr.user=USERNAME -#gpr.key=GH_PERSONAL_ACCESS_TOKEN diff --git a/repositories.gradle b/repositories.gradle index 56d04e9..8370820 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -9,12 +9,4 @@ ext.globalRepositoryDefinition = { google() mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/bmwcarit/ramses-android") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("gpr.key") ?: System.getenv("GPR_TOKEN_READ") - } - } } From 41cc1e91d4aa673a55de6bf8e5e0db6a0f830ca6 Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Thu, 2 Jun 2022 19:03:23 +0200 Subject: [PATCH 3/5] Fix readme --- README.md | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 077f15c..aa8938d 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,14 @@ # Ramses sample app +![Car](./doc/screenshot.png) + This application demonstrates the usage of the [Ramses rendering engine](https://ramses-sdk.readthedocs.io/en/latest/index.html) alongside a 3D vehicle model of a BMW X5 (2018). The application is written in Kotlin and the vehicle resource is built using the [Ramses Composer](https://github.com/bmwcarit/ramses-composer) GUI -v0.13.1. You can find a modifiable project with the car [on Github](https://github.com/bmwcarit/digital-car-3d). - - +v1.0.0. You can find a modifiable project with the car [on Github](https://github.com/bmwcarit/digital-car-3d). -If you want to build the app and experiment with the code you need a Github personal access token (PAT). -The PAT is needed to fetch the Ramses Maven packages from the Github Packages registry. -For further information how to create a Github PAT, take a look at the [githubs guide](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). -To fetch packages, the token needs the 'read:packages' permission only. - -Now you only need to use the PAT for this repo. -For this to work just uncomment line 18 and 19 in the [gradle.properties file](./gradle.properties) and substitute the two strings "USERNAME" and -"GH_PERSONAL_ACCESS_TOKEN" with your github username and the github personal access token. Be careful to -not commit these credentials anywhere, the Github token is attributed to you and should not be given to -others or shared. - -If everything worked, you should see a 3D car as the first of two navigable fragments: - -![Car](./doc/screenshot.png) -The first fragment shows a surface with 3D view of a BMW X5 model. The second fragment shows a static +The app has two UI fragments. The first fragment shows a surface with 3D view of a BMW X5 model. The second fragment shows a static logo image. It is possible to mix Ramses 3D content with other Android UI elements in various ways. Be creative! @@ -35,4 +21,5 @@ Ramses itself and the Ramses Logic. The digital car model is licensed under CC-BY-4.0 (see [the source repository](https://github.com/bmwcarit/digital-car-3d)). -The binary files of the digital car model that are located in the apps [asset folder](./app/src/main/assets) are also licensed under CC-BY-4.0 (see [the source repository](https://github.com/bmwcarit/digital-car-3d)). +The binary files of the digital car model that are located in the apps [asset folder](./app/src/main/assets) are +also licensed under CC-BY-4.0 (see [the source repository](https://github.com/bmwcarit/digital-car-3d)). From 6313699c5724fb7a108e332e22b97b73c5e0c4b3 Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Fri, 3 Jun 2022 10:06:25 +0200 Subject: [PATCH 4/5] Take official version of car --- content/digital-car-3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/digital-car-3d b/content/digital-car-3d index 3bf9b18..f16f06b 160000 --- a/content/digital-car-3d +++ b/content/digital-car-3d @@ -1 +1 @@ -Subproject commit 3bf9b18d85987c7643e7aaebba0bd41635fe1e33 +Subproject commit f16f06bc1c52ef31b24e3880f42af84b93d602e3 From dd160e442d39115d6bbf88469dcc23fc7c27de56 Mon Sep 17 00:00:00 2001 From: Violin Yanev Date: Fri, 3 Jun 2022 10:25:32 +0200 Subject: [PATCH 5/5] Simplify gradle command --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7108d6d..307078a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,5 +26,5 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Build APKs - run: ./gradlew -p ./app :app:assembleDebug + run: ./gradlew :app:assembleDebug