Skip to content

Commit

Permalink
Update Gradle version
Browse files Browse the repository at this point in the history
  • Loading branch information
simonrob committed Jul 10, 2024
1 parent 5d5a1c6 commit 905c7ef
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 21 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
/.idea/codeStyles
/.idea/libraries
/.idea/caches
/.idea/deploymentTargetSelector.xml
/.idea/other.xml
.DS_Store
/build
/captures
Expand Down
23 changes: 9 additions & 14 deletions MediaPhone/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {
testNamespace namespace + '.test'
compileSdk 34

def getVersionCode = { -> return 58 }
def getVersionCode = { -> return 59 }

defaultConfig {
manifestPlaceholders.providerId = 'mediaphone'
Expand All @@ -17,7 +17,7 @@ android {
targetSdkVersion 34
minSdkVersion 14
versionCode getVersionCode()
versionName '1.7.5'
versionName '1.7.6'
// versionNameSuffix = '-beta-1'
resourceConfigurations += ['en', 'es', 'fr', 'nl', 'pt', 'pl', 'ru']
}
Expand All @@ -44,6 +44,10 @@ android {
matchingFallbacks = ['debug']
}
}
buildFeatures {
// https://developer.android.com/r/tools/upgrade-assistant/build-config-default
buildConfig true
}

// automatically regenerate fastlane metadata for new releases
tasks.register('generateMetadata', Exec) {
Expand All @@ -64,23 +68,14 @@ android {
dependencies {
implementation project(':MediaUtilities')

//noinspection GradleDependency - upgrading to 1.12.0 and beyond requires API 19; we want to keep a lower minimum
implementation 'com.google.android.material:material:1.11.0' // for overall UI appearance
implementation 'androidx.exifinterface:exifinterface:1.3.7' // for auto-selection of export resolution
//noinspection GradleDependency - upgrading to 1.13.0 and beyond requires API 19; we want to keep a lower minimum
implementation 'androidx.core:core:1.12.0' // for FileProvider
implementation 'androidx.documentfile:documentfile:1.0.1' // for Storage Access Framework

androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'

// fix dependency conflicts with kotlin-stdlib - see: https://youtrack.jetbrains.com/issue/KT-54136/
constraints {
implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0') {
because('kotlin-stdlib-jdk7 is now a part of kotlin-stdlib')
}
implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0') {
because('kotlin-stdlib-jdk8 is now a part of kotlin-stdlib')
}
}
}
2 changes: 1 addition & 1 deletion MediaUtilities
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
dependencies {
// distributionSha256Sum in gradle-wrapper.properties is also required for F-Droid (see distributionUrl version number)
// see: https://gradle.org/release-checksums/
classpath 'com.android.tools.build:gradle:8.4.1'
classpath 'com.android.tools.build:gradle:8.5.0'
}
}

Expand Down
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/59.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
App modernisation and minor refinements
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
android.enableJetifier=true
android.useAndroidX=true

# https://developer.android.com/r/tools/upgrade-assistant/build-config-default
android.defaults.buildfeatures.buildconfig=true

# https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md#r8-full-mode (note: initially caused audio export issue)
android.enableR8.fullMode=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0

0 comments on commit 905c7ef

Please sign in to comment.