Skip to content

Commit 1031210

Browse files
tctrdanoli3
authored andcommitted
Android example : change the name of the example to androidCompositeExample - add one forgotten file
forgot to add this file remove from tracked files change the name of the app forgot to commit ofApp/gradle in androidCompositeExample add gradlew in androidCompositeExample (cherry picked from commit 9ffe385)
1 parent db7259f commit 1031210

61 files changed

Lines changed: 347 additions & 168 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File renamed without changes.
File renamed without changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
android.useAndroidX=true
2+
android.enableJetifier=false
3+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
4+
kotlin.code.style=official
5+
android.prefabVersion=1.0.+
6+
android.buildFeatures.prefab=true
7+
#ndkBuild=false
8+
# https://issuetracker.google.com/149575364
9+
android.enableParallelJsonGen=false
10+
#googleplay=true

examples/android/androidEmptyExample/gradle/wrapper/gradle-wrapper.jar renamed to examples/android/androidCompositeExample/gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

examples/android/androidEmptyExample/gradle/wrapper/gradle-wrapper.properties renamed to examples/android/androidCompositeExample/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.

examples/android/androidEmptyExample/ofApp/build.gradle renamed to examples/android/androidCompositeExample/ofApp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454
}
5555
defaultConfig {
56-
applicationId "cc.openframeworks.ofapp"
56+
applicationId "cc.openframeworks.ofCompositeExample"
5757
minSdkVersion 21
5858
targetSdkVersion 34
5959
versionCode 12

examples/android/androidEmptyExample/ofApp/gradle.properties renamed to examples/android/androidCompositeExample/ofApp/gradle.properties

File renamed without changes.
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

examples/android/androidCompositeExample/ofApp/gradlew

Lines changed: 240 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)