Skip to content

Commit

Permalink
Merge branch 'main' into app-drawer
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolby committed Jan 14, 2025
2 parents 7b72684 + 740378e commit 5f26cd7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ android {
}
}
}
namespace 'au.id.colby.nfcquicksettings'
compileSdk 35
namespace = 'au.id.colby.nfcquicksettings'
compileSdk = 35

defaultConfig {
applicationId "au.id.colby.nfcquicksettings"
minSdk 24
targetSdk 35
versionCode 15
minSdk = 24
targetSdk = 35
versionCode = 15
versionName "1.4.5-pre"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled true
ndk { debugSymbolLevel 'FULL' }
ndk { debugSymbolLevel = 'FULL' }
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
shrinkResources true
shrinkResources = true
if (signingConfigs.hasProperty("release")) signingConfig = signingConfigs.release
}
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.7.3' apply false
id 'com.android.library' version '8.7.3' apply false
id 'com.android.application' version '8.8.0' apply false
id 'com.android.library' version '8.8.0' apply false
id 'org.jetbrains.dokka' version '2.0.0' apply false
id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 5f26cd7

Please sign in to comment.