Skip to content

Commit

Permalink
chore: updated Gradle version, plugins and libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
kikoso committed Sep 15, 2023
1 parent 580ffce commit f731923
Show file tree
Hide file tree
Showing 16 changed files with 223 additions and 154 deletions.
5 changes: 3 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020 Google Inc.
* Copyright 2023 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'com.google.android.secrets-gradle-plugin' version '1.1.0'
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
}

android {
Expand Down Expand Up @@ -47,6 +47,7 @@ android {
kotlinOptions {
jvmTarget = "1.8"
}
namespace 'com.google.maps.android.ktx.demo'
}

// [START maps_android_utils_ktx_install_snippet]
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.maps.android.ktx.demo">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand All @@ -11,7 +10,8 @@
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
buildscript {
ext.versions = [
'android' : [
"buildTools": "29.0.3",
"compileSdk": 31,
"buildTools": "30.0.3",
"compileSdk": 34,
"minSdk" : 19,
"targetSdk" : 31
"targetSdk" : 34
],
'androidMapsUtils' : '2.2.3',
'androidMapsUtils' : '3.5.3',
'androidx' : [
'appcompat': '1.1.0',
'coreKtx' : '1.2.0',
Expand All @@ -31,7 +31,7 @@ buildscript {
'junit' : '1.1.1',
],
'junit' : '4.12',
'kotlin' : '1.6.10',
'kotlin' : '1.6.21',
'kotlinxCoroutines': '1.6.0',
'mapsBeta' : '3.1.0-beta',
'mockito' : '3.0.0',
Expand Down Expand Up @@ -65,15 +65,16 @@ buildscript {
]

repositories {
gradlePluginPortal()
google()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
classpath 'com.hiya:jacoco-android:0.2'
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jan 27 13:34:12 PST 2021
#Fri Sep 15 07:45:22 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
Loading

0 comments on commit f731923

Please sign in to comment.