Skip to content

Commit

Permalink
update versions used by Projucer-based app template.
Browse files Browse the repository at this point in the history
  • Loading branch information
atsushieno committed Feb 8, 2024
1 parent 03c03a0 commit 8348b2c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 27 deletions.
2 changes: 1 addition & 1 deletion projuce-app-template/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion projuce-app-template/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#Sun Jun 14 02:53:06 JST 2020
android.enableJetifier=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx1536M"

org.gradle.caching=true
org.gradle.configureondemand=true
Expand Down
42 changes: 18 additions & 24 deletions projuce-app-template/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
[versions]

aap-core = "0.8.0-pre"
aap-lv2 = "0.3.0-pre"
aap-core = "0.8.0"
aap-lv2 = "0.3.0"

accompanist-drawablepainter = "0.30.1"
accompanist-permissions = "0.30.1"
agp = "8.1.2"
kotlin = "1.8.10"
accompanist-drawablepainter = "0.32.0"
accompanist-permissions = "0.32.0"
agp = "8.2.2" #"8.4.0-alpha07"
kotlin = "1.9.21"
ndk = "26.1.10909125"
cmake = "3.22.1"
build-tools = "33.0.1"
dokka = "1.8.10"
compose = "1.4.3"
dokka = "1.9.10"
compose = "1.6.0"
compose-compiler = "1.5.6"
androidx-test = "1.5.0"
coroutines = "1.7.3"
coroutines = "1.8.0-RC2"

[libraries]

Expand All @@ -34,8 +35,8 @@ tools-build-gradle = { module = "com.android.tools.build:gradle", version.ref =
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }

compose-bom = { module = "androidx.compose:compose-bom", version = "2023.08.00" }
navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.7.4" }
compose-bom = { module = "androidx.compose:compose-bom", version = "2024.01.00" }
navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.7.6" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.12.0" }
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
Expand All @@ -46,15 +47,10 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
preference-ktx = { module = "androidx.preference:preference-ktx", version = "1.2.1" }
libcxx-provider = { module = "dev.atsushieno:libcxx-provider", version.ref = "ndk" }

lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version = "2.6.2" }
lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.2" }
activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.0" }
webkit = { module = "androidx.webkit:webkit", version = "1.8.0" }

compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-material = { module = "androidx.compose.material:material", version = "1.5.4" }
compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version = "2.7.0" }
lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.7.0" }
activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
webkit = { module = "androidx.webkit:webkit", version = "1.10.0" }

junit = { module = "junit:junit", version = "4.13.2" }
test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
Expand All @@ -63,12 +59,10 @@ test-runner = { module = "androidx.test:runner", version = "1.5.2" }
test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
test-espresso-core = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }

ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.6.0" }
ktmidi = { module = "dev.atsushieno:ktmidi", version = "0.6.2" }

oboe = { module = "com.google.oboe:oboe", version = "1.8.0" }
ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
material3 = { group = "androidx.compose.material3", name = "material3" }

[plugins]
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion projuce-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ fi
sed -i $SED_I_ARGS -e "s/defaultConfig {/defaultConfig {\n proguardFiles \"proguard-rules.pro\"/" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/ANDROID_ARM_MODE/INVALIDATED_ANDROID_ARM_MODE/" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/c++_static/c++_shared/" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/repositories {/buildFeatures { prefab true }\n repositories {/" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/repositories {/ndkVersion libs.versions.ndk.get() \n buildFeatures { prefab true }\n repositories {/" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/android {/android {\n namespace \"org.androidaudioplugin.ports.juce.$APPNAMELOWER\"\n /" -- Builds/Android/app/build.gradle
sed -i $SED_I_ARGS -e "s/apply plugin:/apply plugin: \"kotlin-android\"\napply plugin:/" -- Builds/Android/app/build.gradle

Expand Down

0 comments on commit 8348b2c

Please sign in to comment.