update versions

Author: Nailik

.idea/compiler.xml

@@ -1,18 +1,26 @@
+@file:Suppress("UnstableApiUsage")
+
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace = "io.github.nailik.androidresampler_demo"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "io.github.nailik.androidresampler_demo"
         minSdk = 24
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        targetSdk = 36
+        versionCode = 2
+        versionName = "1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -30,18 +38,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
+        sourceCompatibility = JavaVersion.VERSION_22
+        targetCompatibility = JavaVersion.VERSION_22
     }
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -59,12 +61,18 @@ dependencies {
     implementation(libs.ui.graphics)
     implementation(libs.ui.tooling.preview)
     implementation(libs.material3)
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+    implementation(libs.kotlinx.collections.immutable)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
     androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.ui.test.junit4)
     debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_22)
+    }
 }

.idea/gradle.xml

@@ -1,21 +1,23 @@
 @file:Suppress("UnstableApiUsage")
 
-import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinAndroid)
-    id("com.vanniktech.maven.publish") version "0.25.3"
+    alias(libs.plugins.mavenPublish)
 }
 
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.S01)
+    publishToMavenCentral()
     signAllPublications()
 }
 
 mavenPublishing {
-    coordinates("io.github.nailik", "androidresampler", "0.2")
+    coordinates("io.github.nailik", "androidresampler", "0.3")
 
     pom {
         name.set("androidresampler")
@@ -46,12 +48,17 @@ mavenPublishing {
 
 android {
     namespace = "io.github.nailik.androidresampler"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
-        minSdk = 1
+        minSdk = 21
         aarMetadata {
-            minCompileSdk = 1
+            minCompileSdk = 21
+        }
+        externalNativeBuild {
+            cmake {
+                arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
+            }
         }
     }
     buildTypes {
@@ -64,16 +71,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
+        sourceCompatibility = JavaVersion.VERSION_22
+        targetCompatibility = JavaVersion.VERSION_22
     }
     externalNativeBuild {
         cmake {
             path = file("src/main/cpp/CMakeLists.txt")
-            version = "3.22.1"
+            version = "4.0.3"
         }
     }
     testFixtures {
@@ -85,4 +89,10 @@ android {
             withJavadocJar()
         }
     }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_22)
+    }
 }

.idea/misc.xml

@@ -7,7 +7,7 @@
 set(CMAKE_CXX_STANDARD 17)
 
 # Sets the minimum CMake version required for this project.
-cmake_minimum_required(VERSION 3.22.1)
+cmake_minimum_required(VERSION 4.0.3)
 
 # Declares the project name. The project name can be accessed via ${ PROJECT_NAME},
 # Since this is the top level CMakeLists.txt, the project name is also accessible

androidresampler-demo/build.gradle.kts

@@ -120,7 +120,7 @@ void MultiChannelResampler::writeFrame(const float *frame) {
 }
 
 float MultiChannelResampler::sinc(float radians) {
-    if (abs(radians) < 1.0e-9) return 1.0f;   // avoid divide by zero
+    if (fabsf(radians) < 1.0e-9f) return 1.0f;   // avoid divide by zero
     return sinf(radians) / radians;   // Sinc function
 }
 

androidresampler/build.gradle.kts

@@ -14,9 +14,7 @@ To build it for use outside of Oboe:
 
 1. Copy the "resampler" folder to a folder in your project that is in the include path.
 2. Add all of the \*.cpp files in the resampler folder to your project IDE or Makefile.
-3. In ResamplerDefinitions.h, define RESAMPLER_OUTER_NAMESPACE with your own project name.
-   Alternatively, use -DRESAMPLER_OUTER_NAMESPACE=mynamespace when compiling to avoid modifying the
-   resampler code.
+3. In ResamplerDefinitions.h, define RESAMPLER_OUTER_NAMESPACE with your own project name. Alternatively, use -DRESAMPLER_OUTER_NAMESPACE=mynamespace when compiling to avoid modifying the resampler code.
 
 ## Creating a Resampler
 
@@ -25,8 +23,7 @@ Include the [main header](MultiChannelResampler.h) for the resampler.
     #include "resampler/MultiChannelResampler.h"
 
 Here is an example of creating a stereo resampler that will convert from 44100 to 48000 Hz.
-Only do this once, when you open your stream. Then use the sample resampler to process multiple
-buffers.
+Only do this once, when you open your stream. Then use the sample resampler to process multiple buffers.
 
     MultiChannelResampler *resampler = MultiChannelResampler::make(
             2, // channel count
@@ -35,37 +32,30 @@ buffers.
             MultiChannelResampler::Quality::Medium); // conversion quality
 
 Possible values for quality include { Fastest, Low, Medium, High, Best }.
-Higher quality levels will sound better but consume more CPU because they have more taps in the
-filter.
+Higher quality levels will sound better but consume more CPU because they have more taps in the filter.
 
 ## Fractional Frame Counts
 
 Note that the number of output frames generated for a given number of input frames can vary.
 
-For example, suppose you are converting from 44100 Hz to 48000 Hz and using an input buffer with 960
-frames. If you calculate the number of output frames you get:
+For example, suppose you are converting from 44100 Hz to 48000 Hz and using an input buffer with 960 frames. If you calculate the number of output frames you get:
 
     960.0 * 48000 / 44100 = 1044.897959...
 
-You cannot generate a fractional number of frames. So the resampler will sometimes generate 1044
-frames and sometimes 1045 frames. On average it will generate 1044.897959 frames. The resampler
-stores the fraction internally and keeps track of when to consume or generate a frame.
+You cannot generate a fractional number of frames. So the resampler will sometimes generate 1044 frames and sometimes 1045 frames. On average it will generate 1044.897959 frames. The resampler stores the fraction internally and keeps track of when to consume or generate a frame.
 
-You can either use a fixed number of input frames or a fixed number of output frames. The other
-frame count will vary.
+You can either use a fixed number of input frames or a fixed number of output frames. The other frame count will vary.
 
 ## Calling the Resampler with a fixed number of OUTPUT frames
 
-In this example, suppose we have a fixed number of output frames and a variable number of input
-frames.
+In this example, suppose we have a fixed number of output frames and a variable number of input frames.
 
 Assume you start with these variables and a method that returns the next input frame:
 
     float *outputBuffer;     // multi-channel buffer to be filled
     int    numOutputFrames;  // number of frames of output
 
-The resampler has a method isWriteNeeded() that tells you whether to write to or read from the
-resampler.
+The resampler has a method isWriteNeeded() that tells you whether to write to or read from the resampler.
 
     int outputFramesLeft = numOutputFrames;
     while (outputFramesLeft > 0) {
@@ -81,8 +71,7 @@ resampler.
 
 ## Calling the Resampler with a fixed number of INPUT frames
 
-In this example, suppose we have a fixed number of input frames and a variable number of output
-frames.
+In this example, suppose we have a fixed number of input frames and a variable number of output frames.
 
 Assume you start with these variables:
 

androidresampler/src/main/cpp/CMakeLists.txt

@@ -1,14 +1,16 @@
 [versions]
-activity-compose = "1.7.2"
-agp = "8.1.0"
-kotlin = "1.9.0"
-core-ktx = "1.10.1"
+activity-compose = "1.10.1"
+agp = "8.12.0"
+kotlin = "2.2.0"
+core-ktx = "1.16.0"
 junit = "4.13.2"
-androidx-test-ext-junit = "1.1.5"
-espresso-core = "3.5.1"
-ui = "1.4.3"
-lifecycle-runtime-ktx = "2.6.1"
-compose-bom = "2023.06.01"
+androidx-test-ext-junit = "1.3.0"
+espresso-core = "3.7.0"
+kotlinx-collections-immutable = "0.4.0"
+ui = "1.8.3"
+lifecycle-runtime-ktx = "2.9.2"
+compose-bom = "2025.07.00"
+maven-publish = "0.34.0"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
@@ -17,6 +19,7 @@ core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
+kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx-collections-immutable" }
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
 ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
@@ -30,4 +33,6 @@ material3 = { group = "androidx.compose.material3", name = "material3" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
 

androidresampler/src/main/cpp/resampler/MultiChannelResampler.cpp

@@ -1,6 +1,6 @@
 #Thu Jul 20 13:01:25 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-milestone-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists