From bd7f312a615ca33fff37a026e68d900eb18ee899 Mon Sep 17 00:00:00 2001 From: ritessshhh Date: Thu, 26 Dec 2024 11:00:56 -0500 Subject: [PATCH] edited build for comp_nd --- comp_nd/build.gradle | 16 ++++++++++------ gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/comp_nd/build.gradle b/comp_nd/build.gradle index 4479194ff..65fc40924 100644 --- a/comp_nd/build.gradle +++ b/comp_nd/build.gradle @@ -11,7 +11,6 @@ android { versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - } buildTypes { @@ -20,19 +19,24 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - } dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0') { exclude group: 'com.android.support', module: 'support-annotations' - }) + } api project(path: ':util') - api project (':resources') + api project(path: ':resources') implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'com.google.android:flexbox:1.0.0' + // Updated flexbox library + implementation 'com.google.android:flexbox:3.0.0' // Use the latest version } + +repositories { + google() + mavenCentral() // Ensure Maven Central is added +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index df730a970..536fa7ea7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ # Default value: -Xmx10248m -XX:MaxPermSize=256m android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 --add-opens=java.base/java.io=ALL-UNNAMED # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 186b71557..cb05be028 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file