Skip to content

Commit

Permalink
API 34
Browse files Browse the repository at this point in the history
  • Loading branch information
czodroid committed Aug 14, 2024
1 parent d8dbcd9 commit b566e70
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 19 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.iml
*.sw?
.*.sw?
.DS_Store
/local.properties
/.gradle/
Expand Down
24 changes: 11 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,36 @@ def keystoreProperties = new Properties()
def canSign = false
if (keystorePropertiesFile.exists()) {
canSign = true
println("-> release will be signed")
println("-> release will be signed.")
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

int minutesSinceEpoch = System.currentTimeMillis() / 1000 / 60
println("-> minutesSinceEpoch: " + minutesSinceEpoch)
println("-> minuteSinceEpoch: " + minutesSinceEpoch)
String buildDateYMD = new java.text.SimpleDateFormat("yyyyMMdd").format(new java.util.Date(System.currentTimeMillis()))
println("-> buildDateYMD: " + buildDateYMD)
println("-> buildDateYMD: " + buildDateYMD)
String buildDateYHM = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm").format(new java.util.Date(System.currentTimeMillis()))
println("-> buildDateYHM: " + buildDateYHM)
println("-> buildDateYHM: " + buildDateYHM)
def gitVersionName = "git -C ${rootDir} describe --tags --long".execute().text.trim()
println("-> gitVersionName: " + gitVersionName)
//defined in buildtypes
def buildDateTxt

android {
namespace 'org.czo.droid48sx'
compileSdk 33
compileSdk 34
//ndkVersion '25.1.8937393'
defaultConfig {

applicationId "org.czo.droid48sx"
minSdkVersion 19
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode minutesSinceEpoch

println("-> gitVersionName: " + gitVersionName)
setProperty("versionName", "${gitVersionName}".replaceAll(/-.*/,''))
println("-> versionName: " + versionName)
println("")

println("-> versionName: " + versionName)
println("-> versionCode: " + minutesSinceEpoch)
setProperty("archivesBaseName", "${applicationId}-${buildDateYMD}")
println("-> archivesBaseName: " + archivesBaseName)
println("-> archivesBaseName: " + archivesBaseName)
println("")
}

Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ android:requestLegacyExternalStorage="true"
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
-->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />


<!--
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
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 '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'com.android.application' version '8.5.2' apply false
id 'com.android.library' version '8.5.2' apply false
}

// task clean(type: Delete) { delete rootProject.buildDir }
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
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 @@
#Mon Apr 18 13:49:39 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit b566e70

Please sign in to comment.