Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated libs to submodules #9

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "oboe_recorder/libsndfile"]
path = oboe_recorder/libsndfile
url = https://github.com/libsndfile/libsndfile.git
[submodule "oboe_recorder/oboe"]
path = oboe_recorder/oboe
url = https://github.com/google/oboe
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@ TODOs
each time user starts recording.
4. Give user the control to save recordings to a new directory location.

## Build

This project has submodules, please before clone these:

```bash
git clone --recursive https://github.com/sheraz-nadeem/oboe_recorder_sample.git
```

Import to Android Studio or build it from command line likes this:

```
cd oboe_recorder_sample/oboe_recorder
./gradlew assembleDebug
```

### Troubleshooting

Some times and when you have a previous version, you need clean the old build caches:

```bash
rm -rf app/.cxx/
```

21 changes: 13 additions & 8 deletions oboe_recorder/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'


android {
compileSdkVersion 28
compileSdkVersion 34
defaultConfig {
applicationId "com.sheraz.oboerecorder"
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -25,15 +26,19 @@ android {
path "src/main/cpp/CMakeLists.txt"
}
}

}



dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.core:core-ktx:1.1.0-alpha05'
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'androidx.core:core-ktx:1.13.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.6.0-alpha04'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-alpha01'
}
3 changes: 2 additions & 1 deletion oboe_recorder/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

<activity
android:name=".MainActivity"
android:screenOrientation="portrait">
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
1 change: 1 addition & 0 deletions oboe_recorder/app/src/main/cpp/AudioEngine.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

#include <oboe/Oboe.h>
#include <assert.h>
#include "AudioEngine.h"
#include "logging_macros.h"

Expand Down
4 changes: 2 additions & 2 deletions oboe_recorder/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.21'
ext.kotlin_version = '1.7.20'
repositories {
google()
jcenter()

}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Loading