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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = true

[*]
disabled_rules = import-ordering
ktlint_function_naming_ignore_when_annotated_with = Composable
8 changes: 4 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: set up JDK 17
uses: actions/setup-java@v2
- uses: actions/checkout@v5.0.0
- name: set up JDK 21
uses: actions/setup-java@v5.0.0
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
cache: gradle

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/checkout@v5.0.0
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
with:
java-version: 17
java-version: 21

# Base64 decodes and pipes the GPG key content into the secret file
- name: Prepare environment
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ Include the dependency in your app `build.gradle`:

```groovy
dependencies {
implementation 'com.adevinta.android:leku:12.0.0'
implementation 'com.adevinta.android:leku:13.0.0'
}
```

Alternatively, if you are using a different version of Google Play Services and AndroidX use this instead:

```groovy
implementation ('com.adevinta.android:leku:12.0.0') {
implementation ('com.adevinta.android:leku:13.0.0') {
exclude group: 'com.google.android.gms'
exclude group: 'androidx.appcompat'
}
Expand Down Expand Up @@ -224,6 +224,7 @@ val locationPickerIntent = LocationPickerActivity.Builder(applicationContext)
.withGoogleTimeZoneEnabled()
.withVoiceSearchHidden()
.withUnnamedRoadHidden()
.withSolidBottomColor()
.withSearchBarHidden()
.build()

Expand Down
33 changes: 15 additions & 18 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ plugins {
id("kotlin-android")
id("org.jlleitschuh.gradle.ktlint")
id("io.gitlab.arturbosch.detekt")
id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
alias(libs.plugins.compose.compiler)
}

android {
defaultConfig {
applicationId = "com.schibsted.mappicker"
minSdk = 23
compileSdk = 34
targetSdk = 34
compileSdk = 36
targetSdk = 36
versionCode = 1
versionName = "1.0"
vectorDrawables.useSupportLibrary = true
Expand All @@ -22,22 +22,19 @@ android {
buildTypes {
getByName("release") {
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = JavaVersion.VERSION_21.toString()
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
}
lint {
disable.add("ObsoleteLintCustomCheck")
}
Expand Down Expand Up @@ -70,15 +67,15 @@ ktlint {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
implementation("androidx.multidex:multidex:2.0.1")
implementation("com.google.android.material:material:1.12.0")
implementation("com.google.android.gms:play-services-maps:19.0.0")
implementation(libs.androidx.multidex)
implementation(libs.material)
implementation(libs.play.services.maps)

implementation("androidx.activity:activity-compose:1.9.2")
implementation("androidx.compose.material:material:1.7.3")
implementation("androidx.compose.animation:animation:1.7.3")
implementation("androidx.compose.ui:ui-tooling:1.7.3")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.material)
implementation(libs.androidx.animation)
implementation(libs.androidx.ui.tooling)
implementation(libs.androidx.lifecycle.viewmodel.compose)

implementation(project(":leku"))
}
Loading