Skip to content

Commit fd9a7cc

Browse files
authored
fix: modernized repository and dependencies (#135)
* feat: modernized repository and dependencies * feat: added version catalog * feat: changed RxAndroid version * feat: correct imports, removed targetSdk
1 parent 3911dc9 commit fd9a7cc

File tree

15 files changed

+207
-175
lines changed

15 files changed

+207
-175
lines changed

.gitignore

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
.gradle
2-
.idea
1+
# Gradle and IDE-related files
2+
.gradle/
3+
.idea/
34
*.iml
4-
build
5+
6+
# Build output directories
7+
build/
8+
9+
# Local configuration files
510
local.properties
611
.classpath
712
.project
813
project.properties
914
secure.properties
15+
16+
# macOS-specific files
1017
.DS_Store

app/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/build.gradle

Lines changed: 0 additions & 69 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
plugins {
2+
id("com.android.application")
3+
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
4+
id("kotlin-android")
5+
}
6+
7+
android {
8+
lint {
9+
sarifOutput = file("$buildDir/reports/lint-results.sarif")
10+
}
11+
12+
buildFeatures {
13+
buildConfig = true
14+
}
15+
16+
compileSdk = 35
17+
namespace = "com.google.maps.android.rx.demo"
18+
19+
defaultConfig {
20+
applicationId = "com.google.maps.android.rx.demo"
21+
minSdk = 24
22+
targetSdk = 35
23+
versionCode = 1
24+
versionName = "1.0"
25+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
26+
}
27+
28+
buildTypes {
29+
getByName("release") {
30+
isMinifyEnabled = false
31+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
32+
}
33+
}
34+
35+
compileOptions {
36+
sourceCompatibility = JavaVersion.VERSION_1_8
37+
targetCompatibility = JavaVersion.VERSION_1_8
38+
}
39+
40+
kotlinOptions {
41+
jvmTarget = "1.8"
42+
}
43+
}
44+
45+
dependencies {
46+
// RxJava bindings for the Maps SDK
47+
implementation(libs.mapsRx)
48+
49+
// RxJava bindings for the Places SDK
50+
implementation(libs.placesRx)
51+
52+
// It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you
53+
// have the latest features and bug fixes.
54+
implementation(libs.playServicesMaps)
55+
implementation(libs.places)
56+
implementation(libs.rxJava)
57+
implementation(libs.appCompat)
58+
implementation(libs.lifecycleRuntimeKtx)
59+
implementation(libs.material)
60+
implementation(libs.rxLifecycle)
61+
implementation(libs.mapsKtx)
62+
implementation(libs.kotlinStdlib)
63+
}
64+
65+
secrets {
66+
defaultPropertiesFileName = "local.defaults.properties"
67+
}

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ buildscript {
2323
maven(url = "https://plugins.gradle.org/m2/")
2424
}
2525
dependencies {
26-
classpath("com.android.tools.build:gradle:8.7.1")
26+
classpath("com.android.tools.build:gradle:8.7.2")
2727
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
28-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
29-
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
28+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
29+
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
3030
classpath("com.mxalbert.gradle:jacoco-android:0.2.1")
3131
}
3232
}

gradle/libs.versions.toml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[versions]
2+
kotlin = "2.0.21"
3+
rxandroid = "3.0.2"
4+
rxjava = "3.1.8"
5+
playServicesMaps = "19.0.0"
6+
places = "4.1.0"
7+
appCompat = "1.7.0"
8+
lifecycleRuntimeKtx = "2.8.7"
9+
material = "1.12.0"
10+
rxLifecycle = "4.0.2"
11+
mapsKtx = "5.1.1"
12+
volley = "1.2.1"
13+
mapsRx = "1.0.0"
14+
placesRx = "1.0.0"
15+
16+
[libraries]
17+
mapsRx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }
18+
placesRx = { module = "com.google.maps.android:places-rx", version.ref = "placesRx" }
19+
jetbrainsKotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
20+
kotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
21+
rxJava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
22+
rxAndroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" }
23+
playServicesMaps = { module = "com.google.android.gms:play-services-maps", version.ref = "playServicesMaps" }
24+
places = { module = "com.google.android.libraries.places:places", version.ref = "places" }
25+
appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" }
26+
lifecycleRuntimeKtx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
27+
material = { module = "com.google.android.material:material", version.ref = "material" }
28+
rxLifecycle = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version.ref = "rxLifecycle" }
29+
mapsKtx = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsKtx" }
30+
volley = { module = "com.android.volley:volley", version.ref = "volley" }

maps-rx/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

maps-rx/build.gradle

Lines changed: 0 additions & 32 deletions
This file was deleted.

maps-rx/build.gradle.kts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
android {
2+
lint {
3+
sarifOutput = file("$buildDir/reports/lint-results.sarif")
4+
}
5+
6+
namespace = "com.google.maps.android.rx.maps"
7+
8+
compileSdk = 35
9+
10+
defaultConfig {
11+
minSdk = 24
12+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
13+
consumerProguardFiles("consumer-rules.pro")
14+
}
15+
16+
compileOptions {
17+
sourceCompatibility = JavaVersion.VERSION_1_8
18+
targetCompatibility = JavaVersion.VERSION_1_8
19+
}
20+
21+
kotlinOptions {
22+
jvmTarget = "1.8"
23+
freeCompilerArgs += "-Xexplicit-api=strict"
24+
}
25+
}
26+
27+
dependencies {
28+
implementation(project(":shared"))
29+
implementation(libs.playServicesMaps)
30+
implementation(libs.jetbrainsKotlinStdlib)
31+
implementation(libs.rxAndroid)
32+
implementation(libs.rxJava)
33+
}

places-rx/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)