Skip to content

Commit

Permalink
Merge pull request #1 from violinyanev/update-to-new-package
Browse files Browse the repository at this point in the history
Update to new package
  • Loading branch information
violinyanev authored Jun 3, 2022
2 parents 12e7a8e + dd160e4 commit 783ef71
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 40 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
tags:
- 'v*.*.*'

env:
BUILD_TYPE: Release

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -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
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -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 :app:assembleDebug

25 changes: 6 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -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!

Expand All @@ -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)).
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions app/src/main/assets/G05.ramses
Git LFS file not shown
4 changes: 2 additions & 2 deletions app/src/main/assets/G05.rlogic
Git LFS file not shown
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}

0 comments on commit 783ef71

Please sign in to comment.