Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
.gradle
.idea
# Gradle and IDE-related files
.gradle/
.idea/
*.iml
build

# Build output directories
build/

# Local configuration files
local.properties
.classpath
.project
project.properties
secure.properties

# macOS-specific files
.DS_Store
1 change: 0 additions & 1 deletion app/.gitignore

This file was deleted.

69 changes: 0 additions & 69 deletions app/build.gradle

This file was deleted.

67 changes: 67 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
plugins {
id("com.android.application")
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
id("kotlin-android")
}

android {
lint {
sarifOutput = file("$buildDir/reports/lint-results.sarif")
}

buildFeatures {
buildConfig = true
}

compileSdk = 35
namespace = "com.google.maps.android.rx.demo"

defaultConfig {
applicationId = "com.google.maps.android.rx.demo"
minSdk = 24
targetSdk = 35
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}
}

dependencies {
// RxJava bindings for the Maps SDK
implementation(libs.mapsRx)

// RxJava bindings for the Places SDK
implementation(libs.placesRx)

// It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you
// have the latest features and bug fixes.
implementation(libs.playServicesMaps)
implementation(libs.places)
implementation(libs.rxJava)
implementation(libs.appCompat)
implementation(libs.lifecycleRuntimeKtx)
implementation(libs.material)
implementation(libs.rxLifecycle)
implementation(libs.mapsKtx)
implementation(libs.kotlinStdlib)
}

secrets {
defaultPropertiesFileName = "local.defaults.properties"
}
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ buildscript {
maven(url = "https://plugins.gradle.org/m2/")
}
dependencies {
classpath("com.android.tools.build:gradle:8.7.1")
classpath("com.android.tools.build:gradle:8.7.2")
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
classpath("com.mxalbert.gradle:jacoco-android:0.2.1")
}
}
Expand Down
30 changes: 30 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[versions]
kotlin = "2.0.21"
rxandroid = "3.0.2"
rxjava = "3.1.8"
playServicesMaps = "19.0.0"
places = "4.1.0"
appCompat = "1.7.0"
lifecycleRuntimeKtx = "2.8.7"
material = "1.12.0"
rxLifecycle = "4.0.2"
mapsKtx = "5.1.1"
volley = "1.2.1"
mapsRx = "1.0.0"
placesRx = "1.0.0"

[libraries]
mapsRx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }
placesRx = { module = "com.google.maps.android:places-rx", version.ref = "placesRx" }
jetbrainsKotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
rxJava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
rxAndroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" }
playServicesMaps = { module = "com.google.android.gms:play-services-maps", version.ref = "playServicesMaps" }
places = { module = "com.google.android.libraries.places:places", version.ref = "places" }
appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" }
lifecycleRuntimeKtx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
material = { module = "com.google.android.material:material", version.ref = "material" }
rxLifecycle = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version.ref = "rxLifecycle" }
mapsKtx = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsKtx" }
volley = { module = "com.android.volley:volley", version.ref = "volley" }
1 change: 0 additions & 1 deletion maps-rx/.gitignore

This file was deleted.

32 changes: 0 additions & 32 deletions maps-rx/build.gradle

This file was deleted.

33 changes: 33 additions & 0 deletions maps-rx/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
android {
lint {
sarifOutput = file("$buildDir/reports/lint-results.sarif")
}

namespace = "com.google.maps.android.rx.maps"

compileSdk = 35

defaultConfig {
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xexplicit-api=strict"
}
}

dependencies {
implementation(project(":shared"))
implementation(libs.playServicesMaps)
implementation(libs.jetbrainsKotlinStdlib)
implementation(libs.rxAndroid)
implementation(libs.rxJava)
}
1 change: 0 additions & 1 deletion places-rx/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions places-rx/build.gradle

This file was deleted.

34 changes: 34 additions & 0 deletions places-rx/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
android {
lint {
sarifOutput = file("$buildDir/reports/lint-results.sarif")
}

namespace = "com.google.maps.android.rx.places"

compileSdk = 35

defaultConfig {
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xexplicit-api=strict"
}
}

dependencies {
implementation(project(":shared"))
implementation(libs.places)
implementation(libs.volley)
implementation(libs.rxAndroid)
implementation(libs.rxJava)
implementation(libs.jetbrainsKotlinStdlib)
}
1 change: 0 additions & 1 deletion shared/.gitignore

This file was deleted.

31 changes: 0 additions & 31 deletions shared/build.gradle

This file was deleted.

Loading