From cad3cbedb8244e62ad62e4bde43c72c6cddb7c10 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Fri, 15 Nov 2024 09:54:46 +0100 Subject: [PATCH 1/6] [fix] migrates from jcenter to maven central. --- app/build.gradle | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index af10d90..96b69ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' testImplementation 'junit:junit:4.12' // https://github.com/ShawnLin013/NumberPicker - implementation 'com.shawnlin:number-picker:2.4.4' + implementation 'io.github.ShawnLin013:number-picker:2.4.13' // Backup implementation project(path: ':backup-api') diff --git a/build.gradle b/build.gradle index 5905cb1..bce7a4c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { repositories { - jcenter() + mavenCentral() maven { url 'https://maven.google.com/' name 'Google' @@ -22,7 +22,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() } } From 4676c9c1bb97039ad319f2f179adcdf2c7b72609 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Fri, 15 Nov 2024 10:05:01 +0100 Subject: [PATCH 2/6] [chore] updates java version and updates backup api. --- app/build.gradle | 4 ++-- libs/privacy-friendly-backup-api | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 96b69ef..a0c17d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } namespace 'org.secuso.aktivpause' lint { diff --git a/libs/privacy-friendly-backup-api b/libs/privacy-friendly-backup-api index d9e4a62..14ee29f 160000 --- a/libs/privacy-friendly-backup-api +++ b/libs/privacy-friendly-backup-api @@ -1 +1 @@ -Subproject commit d9e4a62a7c667de2538681c39394c828f8d26a37 +Subproject commit 14ee29f59bc7c3fbaa765cb1be0fcaab4f948b88 From 4686b377bee8bcd2cc7fcdfeb9b54d69ad913f9e Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Fri, 15 Nov 2024 10:18:55 +0100 Subject: [PATCH 3/6] [update] updates target sdk to 34. Updates AGP and gradlew. --- app/build.gradle | 6 +++--- app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt | 4 ++-- build.gradle | 2 +- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0c17d8..c0bec61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "org.secuso.aktivpause" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 10 - versionName "1.2.0" + versionName "1.2.1" vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt b/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt index 05b7dd9..28e489a 100644 --- a/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt +++ b/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt @@ -15,7 +15,7 @@ class PFAktivpause : Application(), Configuration.Provider { BackupManager.backupRestorer = BackupRestorer() } - override fun getWorkManagerConfiguration(): Configuration { - return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() + override val workManagerConfiguration by lazy { + Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index bce7a4c..548d68f 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { ext.kotlin_version = "1.7.20" dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 915f0e6..10c8f5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,8 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b32f7f6..5047464 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed May 24 23:28:16 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From e7feedb61eb2b464219134e86ca1a97f6014f199 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Fri, 15 Nov 2024 11:55:30 +0100 Subject: [PATCH 4/6] [fix] the exercise gets started automatically if the timer finishes with active app. --- app/src/main/AndroidManifest.xml | 4 +++- .../secuso/aktivpause/activities/TimerActivity.java | 10 +++------- .../org/secuso/aktivpause/service/TimerService.java | 10 +++++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9707c46..88e8f33 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ + + android:exported="false" + android:foregroundServiceType="specialUse"/> Date: Fri, 15 Nov 2024 11:57:09 +0100 Subject: [PATCH 5/6] [chore] removes .idea from versioning. --- .gitignore | 3 +- .idea/codeStyles/Project.xml | 137 ----------------------------------- .idea/compiler.xml | 6 -- .idea/gradle.xml | 21 ------ .idea/jarRepositories.xml | 40 ---------- .idea/kotlinc.xml | 6 -- .idea/misc.xml | 4 - .idea/vcs.xml | 7 -- 8 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/kotlinc.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index c6cbe56..5f94008 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ *.iml .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries +/.idea .DS_Store /build /captures diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 0c51a83..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
-
-
-
-
-
\ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7d3c403..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index f2eacce..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index e1eea1d..0000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e9a58ca..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 7df27e1..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 13db73c0e1799d84e6b243575f0b4b10252a0640 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Thu, 9 Jan 2025 12:56:31 +0100 Subject: [PATCH 6/6] [chore] update kotlin version. Adds default config. --- app/build.gradle | 14 ++++++++++++-- app/lint.xml | 6 ++++++ build.gradle | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 app/lint.xml diff --git a/app/build.gradle b/app/build.gradle index c0bec61..6bdad17 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,8 +3,9 @@ apply plugin: 'kotlin-android' android { - compileSdkVersion 34 + compileSdk 34 + namespace 'org.secuso.aktivpause' defaultConfig { applicationId "org.secuso.aktivpause" minSdkVersion 21 @@ -19,12 +20,21 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + buildFeatures { + buildConfig true + } compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - namespace 'org.secuso.aktivpause' + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + kotlin { + jvmToolchain(17) + } lint { + lintConfig = file("lint.xml") abortOnError false checkReleaseBuilds false } diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 0000000..1da88bd --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/build.gradle b/build.gradle index 548d68f..a8e5d0e 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } - ext.kotlin_version = "1.7.20" + ext.kotlin_version = "2.0.21" dependencies { classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"