Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Enable Jetpack Compose #5520

Open
wants to merge 203 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
203 commits
Select commit Hold shift + click to select a range
d8bb177
Add dependabot.yml
AbdhilahiRWabwire Feb 6, 2024
0db3e93
Gradle: Bump androidx.browser:browser from 1.3.0 to 1.7.0 (#6)
dependabot[bot] Feb 6, 2024
a8c3e6e
Gradle: Bump com.jakewharton.rxbinding2:rxbinding-appcompat-v7 in /ap…
dependabot[bot] Feb 6, 2024
08224ad
Gradle: Bump com.github.chrisbanes:PhotoView from 2.0.0 to 2.3.0 (#15)
dependabot[bot] Feb 6, 2024
f91c38b
Gradle: Bump commons-io:commons-io from 2.6 to 2.15.1 in /app (#14)
dependabot[bot] Feb 6, 2024
17b6b81
Gradle: Bump com.google.code.gson:gson from 2.8.5 to 2.10.1 (#13)
dependabot[bot] Feb 6, 2024
62b7983
Gradle: Bump com.github.triplet.play from 2.7.2 to 3.8.6 in /app (#12)
dependabot[bot] Feb 6, 2024
d756ce3
Gradle: Bump org.junit.jupiter:junit-jupiter-api from 5.10.0 to 5.10.…
dependabot[bot] Feb 6, 2024
41b443d
Actions: Bump actions/cache from 3 to 4 (#10)
dependabot[bot] Feb 6, 2024
85efa48
Gradle: Bump io.reactivex.rxjava2:rxandroid from 2.1.0 to 2.1.1 (#9)
dependabot[bot] Feb 6, 2024
7b18de8
Gradle: Bump org.maplibre.gl:android-plugin-scalebar-v9 in /app (#8)
dependabot[bot] Feb 6, 2024
5f0d5cb
Actions: Bump actions/checkout from 3 to 4 (#7)
dependabot[bot] Feb 6, 2024
bc16a58
Gradle: Bump org.junit.jupiter:junit-jupiter-engine in /app (#5)
dependabot[bot] Feb 6, 2024
a9ea021
Actions: Bump actions/setup-java from 3 to 4 (#4)
dependabot[bot] Feb 6, 2024
736b093
Actions: Bump actions/upload-artifact from 3 to 4 (#1)
dependabot[bot] Feb 6, 2024
988b7ae
Gradle: Bump com.facebook.soloader:soloader from 0.10.5 to 0.11.0 (#3)
dependabot[bot] Feb 6, 2024
6a1c70b
Update build.gradle, gradle-wrapper.properties
AbdhilahiRWabwire Feb 6, 2024
dad9c2e
Remove Duplicate Class
AbdhilahiRWabwire Feb 6, 2024
7d4e2c1
Fix com.jakewharton.rxbinding
AbdhilahiRWabwire Feb 6, 2024
1f69fcc
Retry Fix com.jakewharton.rxbinding
AbdhilahiRWabwire Feb 6, 2024
f8116e2
Merge branch 'main' into main
AbdhilahiRWabwire Feb 6, 2024
38a8d62
Update build.gradle
AbdhilahiRWabwire Feb 7, 2024
bd56712
Update build.gradle
AbdhilahiRWabwire Feb 7, 2024
0ff0b98
Fix OnSwipeTouchListener.kt: (42, 9): 'onFling' overrides nothing
AbdhilahiRWabwire Feb 8, 2024
d615f74
Merge branch 'main' into main
AbdhilahiRWabwire Feb 8, 2024
a162776
Update OnSwipeTouchListener.kt
AbdhilahiRWabwire Feb 8, 2024
dfd9faf
Merge branch 'main' into main
AbdhilahiRWabwire Feb 10, 2024
a79fb54
Dependency Audit
AbdhilahiRWabwire Feb 14, 2024
1177d71
Merge branch 'main' into main
AbdhilahiRWabwire Feb 14, 2024
6db5142
Force Timber
AbdhilahiRWabwire Feb 14, 2024
ff10558
Bump OKHTTP
AbdhilahiRWabwire Feb 14, 2024
772ded9
Fix Errors
AbdhilahiRWabwire Feb 14, 2024
c46e912
kapt JDK 17
AbdhilahiRWabwire Feb 14, 2024
4974855
Dependecy Audit: Part Two
AbdhilahiRWabwire Feb 14, 2024
6b835c8
Revert RxJava
AbdhilahiRWabwire Feb 14, 2024
e65da3e
Update android.yml "--info --scan"
AbdhilahiRWabwire Feb 14, 2024
749dad3
Update androidx.work
AbdhilahiRWabwire Feb 14, 2024
da367ed
Enable Data Binding
AbdhilahiRWabwire Feb 14, 2024
eeb4e20
Merge branch 'main' into main
AbdhilahiRWabwire Feb 14, 2024
36ba6ce
Fix Kapt
AbdhilahiRWabwire Feb 14, 2024
083ceec
Remove 'kotlin-android-extensions'
AbdhilahiRWabwire Feb 14, 2024
fa7c59d
Fix Build Features +'kaptGenerateStubsBetaDebugKotlin' (1.8)
AbdhilahiRWabwire Feb 14, 2024
2cba023
Merge branch 'main' into main
AbdhilahiRWabwire Feb 14, 2024
6866a79
Update build.gradle, dependabot.yml, README.md
AbdhilahiRWabwire Feb 14, 2024
f845ba3
Merge branch 'main' into main
AbdhilahiRWabwire Feb 15, 2024
6d8e78a
Update Jacoco, *.md, *.xml
AbdhilahiRWabwire Feb 15, 2024
f81df6e
Revert *.xml + Update Dependabot
AbdhilahiRWabwire Feb 15, 2024
6d5dc84
Fix Jacoco, ext.kotlin_version = '1.5.9'
AbdhilahiRWabwire Feb 15, 2024
85143a4
Revert Changes
AbdhilahiRWabwire Feb 15, 2024
b3ab567
Revet Changes
AbdhilahiRWabwire Feb 15, 2024
6b3a978
Attempt Fix Kapt
AbdhilahiRWabwire Feb 15, 2024
7ea85c0
Attempt Fix Kapt #2
AbdhilahiRWabwire Feb 15, 2024
ac525d7
Attempt Fix Kapt
AbdhilahiRWabwire Feb 15, 2024
36ba5b2
Migrate From Kapt to KSP
AbdhilahiRWabwire Feb 15, 2024
b25d2e2
Fix KSP
AbdhilahiRWabwire Feb 15, 2024
c21924d
Retry Fix KSP
AbdhilahiRWabwire Feb 15, 2024
44a8aba
Fix KSP
AbdhilahiRWabwire Feb 15, 2024
3b6dbf3
Fix KSP
AbdhilahiRWabwire Feb 15, 2024
a815aea
Merge branch 'main' into main
AbdhilahiRWabwire Feb 15, 2024
ecc6019
Revert to Kapt
AbdhilahiRWabwire Feb 15, 2024
b0d0504
Configure Kapt
AbdhilahiRWabwire Feb 16, 2024
46d653c
Retry Configure Kapt
AbdhilahiRWabwire Feb 16, 2024
fdea566
kotlin.code.style=official
AbdhilahiRWabwire Feb 16, 2024
82e158a
Retry Configure Kapt
AbdhilahiRWabwire Feb 16, 2024
676d3d7
Possible Fix For Kapt
AbdhilahiRWabwire Feb 16, 2024
3357031
Retry
AbdhilahiRWabwire Feb 16, 2024
f5a1f8e
Reconfigure Kapt
AbdhilahiRWabwire Feb 16, 2024
2b738a2
retry configuration
AbdhilahiRWabwire Feb 16, 2024
eabbff9
Try Removing Annotation Processing
AbdhilahiRWabwire Feb 16, 2024
c77338a
Migrate to KSP
AbdhilahiRWabwire Feb 16, 2024
2e6f51d
Revert Changes (Find Broken Kotlin Files)
AbdhilahiRWabwire Feb 17, 2024
28114d1
Revert Changes (Fix Merge Conflicts)
AbdhilahiRWabwire Feb 23, 2024
ba17b35
Merge branch 'main' into main
AbdhilahiRWabwire Feb 23, 2024
a9fa87f
Fix Errors
AbdhilahiRWabwire Feb 23, 2024
8788a1d
Merge branch 'main' into main
AbdhilahiRWabwire Feb 26, 2024
02d79ce
Merge branch 'main' into main
AbdhilahiRWabwire Feb 26, 2024
8607603
Revert Changes/Update JVM args
AbdhilahiRWabwire Feb 27, 2024
a1498a0
Fix Errors
AbdhilahiRWabwire Feb 27, 2024
ca3f042
Test FIx
AbdhilahiRWabwire Feb 28, 2024
d0c4246
Test #2
AbdhilahiRWabwire Feb 28, 2024
9127517
Test #2
AbdhilahiRWabwire Feb 28, 2024
bbb0845
Merge branch 'main' into main
AbdhilahiRWabwire Mar 2, 2024
acffc6e
Merge branch 'main' into main
AbdhilahiRWabwire Mar 5, 2024
e83a1b8
Merge branch 'main' into main
AbdhilahiRWabwire Mar 6, 2024
77b81d5
Update Dependencies
AbdhilahiRWabwire Mar 7, 2024
a562cf2
Merge branch 'main' into main
AbdhilahiRWabwire Mar 8, 2024
7d9e78e
Add Android Cache Fix
AbdhilahiRWabwire Mar 8, 2024
437bcc3
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Mar 9, 2024
6f24bb7
Bump androidx browser, ksp
AbdhilahiRWabwire Mar 9, 2024
2f7af4e
Enable Jetpack Compose
AbdhilahiRWabwire Mar 9, 2024
7ab7a75
Update dependency-injection.md
AbdhilahiRWabwire Mar 9, 2024
14c77a0
Fix Typo
AbdhilahiRWabwire Mar 9, 2024
ca76e35
Update settings.gradle
AbdhilahiRWabwire Mar 10, 2024
cd7f636
Fix settings.gradle
AbdhilahiRWabwire Mar 10, 2024
51a2e84
Fix Errors
AbdhilahiRWabwire Mar 10, 2024
fbbbcb8
Merge branch 'main' into main
AbdhilahiRWabwire Mar 11, 2024
c04b07c
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Mar 11, 2024
5ee227a
Update build.gradle
AbdhilahiRWabwire Mar 12, 2024
0d61190
Fix Errors
AbdhilahiRWabwire Mar 12, 2024
23aef97
Fix Error
AbdhilahiRWabwire Mar 12, 2024
426bfe6
Fix Errors
AbdhilahiRWabwire Mar 13, 2024
cf69d8a
Fix Errors
AbdhilahiRWabwire Mar 13, 2024
1d1d271
Merge branch 'main' into main
AbdhilahiRWabwire Mar 13, 2024
d18d9d7
Add Classpaths to buildscript
AbdhilahiRWabwire Mar 13, 2024
02b6dfd
Fix Errors
AbdhilahiRWabwire Mar 13, 2024
58eab29
Remove Classpaths from buildscript
AbdhilahiRWabwire Mar 13, 2024
5b31dac
Fix Errors
AbdhilahiRWabwire Mar 13, 2024
385e861
Apply Plugins
AbdhilahiRWabwire Mar 13, 2024
9b86b63
Attempt Migrate to KSP
AbdhilahiRWabwire Mar 13, 2024
6a9f5e9
Complete KSP Migration
AbdhilahiRWabwire Mar 13, 2024
fc19563
Update Dependencies
AbdhilahiRWabwire Mar 14, 2024
0fcef09
Fix Errors
AbdhilahiRWabwire Mar 14, 2024
ea63c60
Make Viariables FInal
AbdhilahiRWabwire Mar 14, 2024
dc62658
Merge branch 'main' into main
AbdhilahiRWabwire Mar 15, 2024
aa73ddd
Fix Data Binding
AbdhilahiRWabwire Mar 15, 2024
c3f5fa2
Fix Errors
AbdhilahiRWabwire Mar 15, 2024
529ff80
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Mar 16, 2024
2d211ee
Update Dependencies
AbdhilahiRWabwire Mar 16, 2024
0bb8418
Merge branch 'main' into main
AbdhilahiRWabwire Mar 17, 2024
c807f4a
Merge branch 'main' into main
AbdhilahiRWabwire Mar 18, 2024
10b8a14
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Mar 20, 2024
e04cb69
Merge branch 'main' into main
AbdhilahiRWabwire Mar 22, 2024
9ddd939
Fix Layouts
AbdhilahiRWabwire Mar 24, 2024
28c20e7
Fix Layouts Attempt #2
AbdhilahiRWabwire Mar 24, 2024
4095052
Merge branch 'main' into main
AbdhilahiRWabwire Mar 26, 2024
8dbff22
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Mar 28, 2024
3ec325a
Reduce API Level
AbdhilahiRWabwire Mar 28, 2024
c09f2ea
Raise API Level
AbdhilahiRWabwire Mar 28, 2024
9f742b9
Merge branch 'main' into main
AbdhilahiRWabwire Mar 29, 2024
990fc2f
Resolve Merge Conflicts
AbdhilahiRWabwire Mar 31, 2024
4e1bc55
Resolve Conflicts
AbdhilahiRWabwire Mar 31, 2024
eba4917
Unresolved Merge Conflicts
AbdhilahiRWabwire Mar 31, 2024
dea15b8
Attempt Resolve Merge Conflict
AbdhilahiRWabwire Mar 31, 2024
0b36829
Resolve Merge Conflicts Attempt #2
AbdhilahiRWabwire Mar 31, 2024
a49f952
Merge branch 'main' into main
AbdhilahiRWabwire Mar 31, 2024
7ef080e
Revert Changes to Find Error
AbdhilahiRWabwire Mar 31, 2024
b06c9b2
Merge branch 'main' into main
AbdhilahiRWabwire Mar 31, 2024
a25bade
Revert Changes
AbdhilahiRWabwire Mar 31, 2024
223d488
Update fragment_upload_media_detail_fragment.xml
AbdhilahiRWabwire Mar 31, 2024
281e80f
Update gradle.properties
AbdhilahiRWabwire Mar 31, 2024
8a792bc
android.nonTransitiveRClass=true
AbdhilahiRWabwire Mar 31, 2024
3046358
Merge branch 'main' into main
AbdhilahiRWabwire Apr 4, 2024
d731713
Merge branch 'main' into main
AbdhilahiRWabwire Apr 5, 2024
11dd84d
Update Dependencies
AbdhilahiRWabwire Apr 5, 2024
722576b
Fix Error
AbdhilahiRWabwire Apr 5, 2024
5afe9e7
Add Value
AbdhilahiRWabwire Apr 5, 2024
351fd90
Update gradle.properties
AbdhilahiRWabwire Apr 5, 2024
e3c9a5a
Update Dependabot
AbdhilahiRWabwire Apr 6, 2024
5fd601f
Pass Values
AbdhilahiRWabwire Apr 7, 2024
fb2fdc5
Revert Change
AbdhilahiRWabwire Apr 7, 2024
b856829
Merge branch 'main' into main
AbdhilahiRWabwire Apr 9, 2024
80046af
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Apr 13, 2024
e972d77
Update Dependencies
AbdhilahiRWabwire Apr 13, 2024
770dce9
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Apr 20, 2024
6d77e0e
Revert Changes, Update Dependencies, Find Error
AbdhilahiRWabwire Apr 21, 2024
1b5dc23
Fix Errors
AbdhilahiRWabwire Apr 21, 2024
7f9d8e5
Fix Typo
AbdhilahiRWabwire Apr 21, 2024
99d408d
Merge branch 'main' into main
AbdhilahiRWabwire Apr 23, 2024
29aff29
Update NDK Version
AbdhilahiRWabwire Apr 24, 2024
ea334b7
Update Dependencies
AbdhilahiRWabwire Apr 28, 2024
93497ba
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Apr 28, 2024
e36417e
Update dependabot.yml
AbdhilahiRWabwire Apr 30, 2024
0e9046e
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Apr 30, 2024
98a6a3e
Update Dependencies
AbdhilahiRWabwire May 3, 2024
08b0006
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 3, 2024
4452480
Fix Typo
AbdhilahiRWabwire May 4, 2024
e1e913d
Fix Error
AbdhilahiRWabwire May 4, 2024
ef977fc
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 7, 2024
3efb385
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 10, 2024
ecd7212
Update Dependencies
AbdhilahiRWabwire May 10, 2024
08d01b8
Fix Typo
AbdhilahiRWabwire May 10, 2024
8185b3b
Fic Typo
AbdhilahiRWabwire May 10, 2024
cfe5d14
Update Dependencies
AbdhilahiRWabwire May 11, 2024
b6d8c48
Revert Change
AbdhilahiRWabwire May 11, 2024
7e152a3
Rollback Kotlin Version
AbdhilahiRWabwire May 12, 2024
6561215
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 18, 2024
63a613f
Update Dependencies
AbdhilahiRWabwire May 19, 2024
7022474
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 22, 2024
af021f4
Update Dependencies
AbdhilahiRWabwire May 25, 2024
4a439e8
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 25, 2024
8fc356d
Revert Change
AbdhilahiRWabwire May 28, 2024
6462a3d
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire May 28, 2024
55eb1fb
Update Dependencies
AbdhilahiRWabwire Jun 1, 2024
e249846
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jun 1, 2024
4592cc2
Update Dependencies
AbdhilahiRWabwire Jun 8, 2024
7271fef
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jun 8, 2024
be46887
Merge branch 'main' into main
AbdhilahiRWabwire Jun 12, 2024
ac83ca0
Add Navigation Dependencies
AbdhilahiRWabwire Jun 13, 2024
8e98373
Update Dependencies
AbdhilahiRWabwire Jun 15, 2024
40b2eae
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jun 15, 2024
f11ef07
Update Kotlin Version
AbdhilahiRWabwire Jun 15, 2024
551b883
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jun 20, 2024
df305a1
Edit Navigation Dependencies
AbdhilahiRWabwire Jun 20, 2024
79f120e
Update Dependencies
AbdhilahiRWabwire Jun 22, 2024
722ff42
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jun 23, 2024
1b7fe0b
Fix Syntax
AbdhilahiRWabwire Jun 27, 2024
d24ddde
Update Serialization
AbdhilahiRWabwire Jun 27, 2024
ae829b9
Update Compose Tool
AbdhilahiRWabwire Jun 28, 2024
18f2441
Update Dependencies
AbdhilahiRWabwire Jul 7, 2024
c405ada
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jul 7, 2024
20dfde4
Fix Errors
AbdhilahiRWabwire Jul 7, 2024
d19b452
Fix Errors
AbdhilahiRWabwire Jul 7, 2024
943d7df
Merge branch 'commons-app:main' into main
AbdhilahiRWabwire Jul 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
updates:
- package-ecosystem: "github-actions"
commit-message:
prefix: "Actions"
directory: "/"
schedule:
day: "saturday"
interval: "weekly"
time: "03:00"

- package-ecosystem: "gradle"
commit-message:
prefix: "Gradle"
directory: "/"
schedule:
day: "saturday"
interval: "weekly"
time: "03:00"

version: 2
12 changes: 6 additions & 6 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4.1.7

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: '17'

- name: Cache packages
id: cache-packages
uses: actions/cache@v3
uses: actions/cache@v4.0.2
with:
path: |
~/.gradle/caches
Expand All @@ -37,7 +37,7 @@ jobs:

- name: AVD cache
if: github.event_name != 'pull_request'
uses: actions/cache@v3
uses: actions/cache@v4.0.2
id: avd-cache
with:
path: |
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
run: bash ./gradlew assembleBetaDebug --stacktrace

- name: Upload betaDebug APK
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.4
with:
name: betaDebugAPK
path: app/build/outputs/apk/beta/debug/app-*.apk
Expand All @@ -98,7 +98,7 @@ jobs:
run: bash ./gradlew assembleProdDebug --stacktrace

- name: Upload prodDebug APK
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.4
with:
name: prodDebugAPK
path: app/build/outputs/apk/prod/debug/app-*.apk
301 changes: 189 additions & 112 deletions app/build.gradle

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,31 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath 'org.codehaus.groovy:groovy-all:2.4.15'
classpath 'com.android.tools.build:gradle:8.5.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:4.0.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0'
classpath 'org.codehaus.groovy:groovy-all:3.0.21'
}
}

plugins {
id 'com.android.application' version "8.5.0" apply false
id 'com.android.library' version "8.5.0" apply false
id 'com.getkeepsafe.dexcount' version "4.0.0" apply false
id 'com.google.devtools.ksp' version "2.0.0-1.0.22" apply false
id 'com.github.triplet.play' version "3.10.1" apply false
id 'org.gradle.android.cache-fix' version "3.0.1" apply false
id 'org.jetbrains.kotlin.android' version "2.0.0" apply false
id 'org.jetbrains.kotlin.kapt' version "2.0.0" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0" apply false
}

allprojects {
repositories {
repositories {
google()
mavenCentral()
gradlePluginPortal() // potential jcenter() replacement
gradlePluginPortal()
maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
}
Expand Down
34 changes: 9 additions & 25 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
## Project-wide Gradle settings.
#
# For more details on how to configure your build environment visit
## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
Expand All @@ -12,29 +10,15 @@
# 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
#Thu Mar 01 15:28:48 IST 2018
org.gradle.jvmargs=-Xmx1536M
#Fri Feb 23 04:17:27 MST 2024
org.gradle.caching=true
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
org.gradle.parallel=true
android.enableR8.fullMode=false

KOTLIN_VERSION=1.7.20
LEAK_CANARY_VERSION=2.10
DAGGER_VERSION=2.23
ROOM_VERSION=2.5.0
PREFERENCE_VERSION=1.1.0
CORE_KTX_VERSION=1.9.0
ADAPTER_DELEGATES_VERSION=4.3.0
PAGING_VERSION=2.1.2
MULTIDEX_VERSION=2.0.1
OKHTTP_VERSION=4.10.0
MAPLIBRE_VERSION=10.0.1
OSMDROID_VERSION=6.1.17

#systemProp.http.proxyPort=0
#systemProp.http.proxyHost=
android.useAndroidX=true
android.enableJetifier=true
android.jetifier.ignorelist=bcprov-jdk15on
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.nonTransitiveRClass=true
android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
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 @@
#Sun Apr 23 18:22:54 IST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
21 changes: 21 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
pluginManagement {
repositories {
google()
gradlePluginPortal()
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
maven { url "https://jitpack.io" }
mavenCentral()
}
}

dependencyResolutionManagement {
repositories {
google()
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
maven { url "https://jitpack.io" }
mavenCentral()
}
}

include ':app'

rootProject.name = "WikimediaCommons"