Skip to content

Commit

Permalink
Copy build settings from HelloResolver
Browse files Browse the repository at this point in the history
  • Loading branch information
pmaanen committed Dec 11, 2023
1 parent a6c03c4 commit 39df22d
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
apply plugin: 'com.android.application'
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
namespace 'de.uol.LSLReceiver'
compileSdk 33
ndkVersion "25.2.9519653"
defaultConfig {
Expand Down Expand Up @@ -33,6 +37,19 @@ android {
}
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.3'
}
externalNativeBuild {
cmake {
path "../libxdf/CMakeLists.txt"
Expand Down
31 changes: 4 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'


// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}


allprojects {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
}
plugins {
id 'com.android.application' version '8.1.2' apply false
id 'com.android.library' version '8.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
}

task clean(type: Delete) {
delete rootProject.buildDir
}
14 changes: 3 additions & 11 deletions liblsl-Java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,17 @@
// in the app's build.gradle

buildscript {
repositories {
google()
mavenCentral()
}


dependencies {
classpath 'com.android.tools.build:gradle:7.+'
classpath 'com.android.tools.build:gradle:8.1.+'
}
}

plugins {
id 'com.android.library'
}

repositories {
google()
mavenCentral()
}

dependencies {
implementation 'net.java.dev.jna:jna:5.12.0@aar'
}
Expand All @@ -41,6 +33,7 @@ android {
}

sourceSets.main.java.srcDirs += 'src'
namespace = 'edu.ucsd.sccn'

externalNativeBuild.cmake {
// If the Android SDK CMake is older than 3.12, you need to install CMake locally and
Expand All @@ -51,5 +44,4 @@ android {

}
ndkVersion '25.2.9519653'
namespace 'edu.ucsd.sccn'
}
22 changes: 21 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,24 @@ else {
println("Looking for liblsl-Java in the default path.")
println("Change this via 'gradle -Pliblsl_java_dir=path/here if this fails")
project(':liblsl-Java').projectDir = new File("./liblsl-Java")
}
}pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}

rootProject.name = "RECORDA"
include ':app'

// Add a project stub for liblsl-Java
include 'liblsl-Java'
project(':liblsl-Java').projectDir = new File('./liblsl-Java')

0 comments on commit 39df22d

Please sign in to comment.