From 2946be973ecba6b4af59ed913c8e1d41ab2800cf Mon Sep 17 00:00:00 2001 From: Padmal Date: Mon, 26 Feb 2024 15:48:57 +0100 Subject: [PATCH 1/3] fix: updated app to run and compile --- app/build.gradle.kts | 32 +++++++++++-------- app/src/main/AndroidManifest.xml | 32 ++++++++++--------- .../main/res/xml/data_extraction_rules.xml | 17 ++++++++++ build.gradle.kts | 4 +-- gradle.properties | 8 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 ++ 7 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 app/src/main/res/xml/data_extraction_rules.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ae0981e5..f2e6a9c41 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,12 +8,12 @@ val keystoreExists = System.getenv("KEYSTORE_FILE") != null android { namespace = "io.pslab" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "io.pslab" - minSdk = 21 - targetSdk = 31 + minSdk = 31 + targetSdk = 34 versionCode = 22 versionName = "2.1.0" } @@ -53,15 +53,16 @@ android { } } + dependencies { // Android stock libraries implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.recyclerview:recyclerview:1.3.0") - implementation("com.google.android.material:material:1.9.0") - implementation("androidx.preference:preference:1.2.0") - implementation("androidx.browser:browser:1.5.0") + implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("com.google.android.material:material:1.11.0") + implementation("androidx.preference:preference:1.2.1") + implementation("androidx.browser:browser:1.7.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") // Custom tools libraries @@ -69,7 +70,7 @@ dependencies { implementation("com.github.bmelnychuk:atv:1.2.9") implementation("de.hdodenhof:circleimageview:3.1.0") implementation("com.github.devlight.navigationtabstrip:navigationtabstrip:1.0.4") - implementation("com.afollestad.material-dialogs:core:0.9.6.0") + implementation("com.afollestad.material-dialogs", "commons", "0.9.6.0") implementation("com.github.medyo:android-about-page:1.3.1") implementation("com.github.tiagohm.MarkdownView:library:0.19.0") implementation("com.github.mirrajabi:search-dialog:1.2.4") @@ -77,13 +78,13 @@ dependencies { implementation("com.github.BeppiMenozzi:Knob:1.9.0") implementation("com.github.warkiz.widget:indicatorseekbar:2.1.2") implementation("com.github.Vatican-Cameos:CarouselPicker:1.2") - implementation("com.github.anastr:speedviewlib:1.6.0") + implementation("com.github.anastr:speedviewlib:1.6.1") implementation("com.github.GoodieBag:ProtractorView:v1.2") implementation("com.github.Triggertrap:SeekArc:v1.1") // Apache commons implementation("org.apache.commons:commons-math3:3.6.1") - implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.commons:commons-lang3:3.14.0") // Picasso implementation("com.squareup.picasso:picasso:2.71828") @@ -97,10 +98,13 @@ dependencies { implementation("com.jakewharton:butterknife:$butterKnifeVersion") // Map libraries - val osmDroidVersion = "6.1.11" - implementation("org.osmdroid:osmdroid-android:$osmDroidVersion") - implementation("org.osmdroid:osmdroid-mapsforge:$osmDroidVersion") - implementation("org.osmdroid:osmdroid-geopackage:$osmDroidVersion") + implementation("org.osmdroid:osmdroid-android:6.1.18") + implementation("org.osmdroid:osmdroid-mapsforge:6.1.18") + implementation("org.osmdroid:osmdroid-geopackage:6.1.18") { + exclude("org.osmdroid.gpkg"); + exclude("ormlite-core"); + exclude("com.j256.ormlite"); + } // Realm implementation("io.realm:android-adapters:4.0.0") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 518fa7245..b7bd03371 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ - + @@ -21,24 +21,26 @@ + tools:replace="android:icon,android:allowBackup"> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> + android:screenOrientation="fullSensor" /> diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 000000000..7da4b02dc --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 9bb9b7d24..bb0335115 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,10 +4,10 @@ buildscript { mavenCentral() } dependencies { - classpath("io.realm:realm-gradle-plugin:10.11.0") + classpath("io.realm:realm-gradle-plugin:10.13.3-transformer-api") } } plugins { - id("com.android.application") version "7.4.2" apply false + id("com.android.application") version "8.1.2" apply false } diff --git a/gradle.properties b/gradle.properties index cd6ce48a2..a0c7744c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,18 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx1536m \ +--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ +--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ +--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED google_key = "AIzaSyBFvrqI8_J108WntI7surDGqCUcd1RbHPQ" android.useAndroidX=true android.enableJetifier=true kapt.incremental.apt=true org.gradle.warning.mode=all +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false # When configured, Gradle will run in incubating parallel mode. # 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd797c6ff..b869577c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed May 24 12:24:11 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 675d94659..46b3e9c76 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,7 @@ pluginManagement { mavenCentral() } } + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -14,5 +15,6 @@ dependencyResolutionManagement { maven("https://plugins.gradle.org/m2/") } } + rootProject.name = "PSLab" include(":app") From bd98099bf2ffe50e82f32713196ca92040ff0688 Mon Sep 17 00:00:00 2001 From: Padmal Date: Mon, 26 Feb 2024 15:53:24 +0100 Subject: [PATCH 2/3] chore: updated java version in actions --- .github/workflows/pull-request.yml | 2 +- .github/workflows/push-event.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4182573e4..064244250 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Build with Gradle run: | diff --git a/.github/workflows/push-event.yml b/.github/workflows/push-event.yml index 2480920af..df07f95c1 100644 --- a/.github/workflows/push-event.yml +++ b/.github/workflows/push-event.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Build with Gradle run: | From bceca7cc59c13aff1bb6074731dc94d0085af29e Mon Sep 17 00:00:00 2001 From: Padmal Date: Mon, 26 Feb 2024 16:48:36 +0100 Subject: [PATCH 3/3] chore: upgraded app version --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f2e6a9c41..01564b5bf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,7 @@ android { minSdk = 31 targetSdk = 34 versionCode = 22 - versionName = "2.1.0" + versionName = "3.1.0" } signingConfigs {