worked on a lot of nothing
This commit is contained in:
@@ -11,8 +11,8 @@ android {
|
||||
minSdk = 23
|
||||
targetSdk = 34
|
||||
versionCode = 5
|
||||
|
||||
versionName = "2.3"
|
||||
multiDexEnabled = true // Required since you added the multidex dependency
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -26,6 +26,7 @@ android {
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
@@ -36,42 +37,51 @@ android {
|
||||
resources {
|
||||
excludes += "META-INF/DEPENDENCIES"
|
||||
excludes += "META-INF/INDEX.LIST"
|
||||
// CRITICAL: WPILib libraries include desktop JNI files.
|
||||
// This prevents duplicate file and incompatible native architecture errors.
|
||||
excludes += "**/libntcore.dylib"
|
||||
excludes += "**/ntcore.dll"
|
||||
excludes += "**/libntcore.so"
|
||||
excludes += "**/libwpiutil.dylib"
|
||||
excludes += "**/wpiutil.dll"
|
||||
excludes += "**/libwpiutil.so"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
// Desugaring & MultiDex
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
|
||||
implementation("androidx.multidex:multidex:2.0.1")
|
||||
|
||||
// Core Android UI
|
||||
implementation(libs.activity.ktx)
|
||||
implementation(libs.appcompat)
|
||||
implementation(libs.material)
|
||||
implementation(libs.activity)
|
||||
implementation(libs.constraintlayout)
|
||||
dependencies {
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
|
||||
implementation("androidx.multidex:multidex:2.0.1")
|
||||
|
||||
// Core Android UI
|
||||
implementation(libs.appcompat)
|
||||
implementation(libs.material)
|
||||
implementation(libs.activity)
|
||||
implementation(libs.constraintlayout)
|
||||
// FRC NetworkTables Dependencies (Kotlin DSL Syntax)
|
||||
implementation(libs.ntcore.java)
|
||||
implementation(libs.wpiutil.java)
|
||||
|
||||
// Google Sheets & Core API (The "1.x" branch fix)
|
||||
implementation("com.google.apis:google-api-services-sheets:v4-rev581-1.25.0")
|
||||
implementation("com.google.api-client:google-api-client:1.32.1")
|
||||
implementation("com.google.oauth-client:google-oauth-client:1.32.1")
|
||||
implementation("com.google.http-client:google-http-client-gson:1.42.3")
|
||||
implementation("com.google.auth:google-auth-library-oauth2-http:1.15.0")
|
||||
|
||||
// JSON & Networking (Consolidated to stable versions)
|
||||
implementation("com.google.code.gson:gson:2.10.1")
|
||||
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||
|
||||
// Testing
|
||||
testImplementation(libs.junit)
|
||||
androidTestImplementation(libs.ext.junit)
|
||||
androidTestImplementation(libs.espresso.core)
|
||||
// Google Sheets & Core API
|
||||
implementation("com.google.apis:google-api-services-sheets:v4-rev581-1.25.0") {
|
||||
exclude(group = "com.google.guava", module = "listenablefuture")
|
||||
}
|
||||
implementation("com.google.api-client:google-api-client:1.32.1")
|
||||
implementation("com.google.oauth-client:google-oauth-client:1.32.1")
|
||||
implementation("com.google.http-client:google-http-client-gson:1.42.3")
|
||||
implementation("com.google.auth:google-auth-library-oauth2-http:1.15.0")
|
||||
|
||||
// JSON & Networking
|
||||
implementation("com.google.code.gson:gson:2.10.1")
|
||||
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||
|
||||
// Testing
|
||||
testImplementation(libs.junit)
|
||||
androidTestImplementation(libs.ext.junit)
|
||||
androidTestImplementation(libs.espresso.core)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user