diff --git a/nym-connect/native/android/app/build.gradle b/nym-connect/native/android/app/build.gradle deleted file mode 100644 index 72ba890287..0000000000 --- a/nym-connect/native/android/app/build.gradle +++ /dev/null @@ -1,127 +0,0 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' - id 'io.sentry.android.gradle' version '3.11.0' -} - -android { - namespace 'net.nymtech.nyms5' - compileSdk 33 - - defaultConfig { - applicationId "net.nymtech.nyms5" - minSdk 24 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary true - } - } - - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - flavorDimensions "abi" - productFlavors { - universal { - dimension "abi" - ndk { - abiFilters "arm64-v8a", "armeabi-v7a", "x86_64", "x86" - } - } - arch64 { - dimension "abi" - ndk { - abiFilters "arm64-v8a", "x86_64" - } - } - arm64 { - dimension "abi" - ndk { - abiFilters "arm64-v8a" - } - } - arm { - dimension "abi" - ndk { - abiFilters "armeabi-v7a" - } - } - x86_64 { - dimension "abi" - ndk { - abiFilters "x86_64" - } - } - x86 { - dimension "abi" - ndk { - abiFilters "x86" - } - } - } - -// splits { -// abi { -// enable true -// reset() -// include "x86_64", "arm64-v8a" -// universalApk true -// } -// } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion '1.4.6' - } - packagingOptions { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } -} - -dependencies { - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' - implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0' - implementation platform('androidx.compose:compose-bom:2022.10.00') - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' - implementation 'androidx.navigation:navigation-compose:2.6.0' - implementation 'androidx.compose.runtime:runtime-livedata' - implementation 'androidx.compose.ui:ui' - implementation 'androidx.compose.ui:ui-graphics' - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.compose.material3:material3' - implementation 'androidx.work:work-runtime-ktx:2.8.1' - implementation 'androidx.datastore:datastore-preferences:1.0.0' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') - androidTestImplementation 'androidx.compose.ui:ui-test-junit4' - debugImplementation 'androidx.compose.ui:ui-tooling' - debugImplementation 'androidx.compose.ui:ui-test-manifest' - implementation 'com.github.kittinunf.fuel:fuel:2.3.1' - implementation 'io.sentry:sentry-android:6.24.0' -} diff --git a/nym-connect/native/android/app/build.gradle.kts b/nym-connect/native/android/app/build.gradle.kts new file mode 100644 index 0000000000..b33dd6d715 --- /dev/null +++ b/nym-connect/native/android/app/build.gradle.kts @@ -0,0 +1,131 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.serialization") version "1.8.21" + id("io.sentry.android.gradle") version "3.11.0" +} + +android { + namespace = "net.nymtech.nyms5" + compileSdk = 33 + + defaultConfig { + applicationId = "net.nymtech.nyms5" + minSdk = 24 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + flavorDimensions += "abi" + productFlavors { + create("universal") { + dimension = "abi" + ndk { + abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86") + } + } + create("arch64") { + dimension = "abi" + ndk { + abiFilters += listOf("arm64-v8a", "x86_64") + } + } + create("arm64") { + dimension = "abi" + ndk { + abiFilters += "arm64-v8a" + } + } + create("arm") { + dimension = "abi" + ndk { + abiFilters += "armeabi-v7a" + } + } + create("x86_64") { + dimension = "abi" + ndk { + abiFilters += "x86_64" + } + } + create("x86") { + dimension = "abi" + ndk { + abiFilters += "x86" + } + } + } + +// splits { +// abi { +// enable true +// reset() +// include "x86_64", "arm64-v8a" +// universalApk true +// } +// } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.4.6" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + + implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.activity:activity-compose:1.7.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") + implementation(platform("androidx.compose:compose-bom:2022.10.00")) + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") + implementation("androidx.navigation:navigation-compose:2.6.0") + implementation("androidx.compose.runtime:runtime-livedata") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.work:work-runtime-ktx:2.8.1") + implementation("androidx.datastore:datastore-preferences:1.0.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.3") + androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") + androidTestImplementation(platform("androidx.compose:compose-bom:2022.10.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") + implementation("com.github.kittinunf.fuel:fuel:2.3.1") + implementation("io.sentry:sentry-android:6.24.0") +} diff --git a/nym-connect/native/android/build.gradle b/nym-connect/native/android/build.gradle deleted file mode 100644 index fd3d478923..0000000000 --- a/nym-connect/native/android/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id 'com.android.application' version '8.0.2' apply false - id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.8.20' apply false -} \ No newline at end of file diff --git a/nym-connect/native/android/build.gradle.kts b/nym-connect/native/android/build.gradle.kts new file mode 100644 index 0000000000..6cb6871c9e --- /dev/null +++ b/nym-connect/native/android/build.gradle.kts @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id("com.android.application") version "8.1.0" apply false + id("com.android.library") version "8.1.0" apply false + id("org.jetbrains.kotlin.android") version "1.8.20" apply false +} \ No newline at end of file diff --git a/nym-connect/native/android/settings.gradle b/nym-connect/native/android/settings.gradle.kts similarity index 94% rename from nym-connect/native/android/settings.gradle rename to nym-connect/native/android/settings.gradle.kts index 0bf8eaecd3..267005beeb 100644 --- a/nym-connect/native/android/settings.gradle +++ b/nym-connect/native/android/settings.gradle.kts @@ -12,5 +12,7 @@ dependencyResolutionManagement { mavenCentral() } } + rootProject.name = "nyms5" -include ':app' +include(":app") + \ No newline at end of file