Skip to content

Commit

Permalink
feat: upgraded dependencies and places SDK (#259)
Browse files Browse the repository at this point in the history
* feat: upgraded dependencies and places SDK

* chore: removed space
  • Loading branch information
kikoso authored Sep 24, 2024
1 parent 397433d commit c273ba6
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ class AutocompleteDemoActivity : AppCompatActivity() {
as AutocompleteSupportFragment

// Specify the types of place data to return.
autocompleteFragment.setPlaceFields(listOf(Place.Field.ID, Place.Field.NAME))
autocompleteFragment.setPlaceFields(listOf(Place.Field.ID,Place.Field.DISPLAY_NAME))

// Listen to place selection events
lifecycleScope.launch {
autocompleteFragment.placeSelectionEvents().collect { event ->
when (event) {
is PlaceSelectionSuccess -> Toast.makeText(
this@AutocompleteDemoActivity,
"Got place '${event.place.name}'",
"Got place '${event.place.displayName}'",
Toast.LENGTH_SHORT
).show()
is PlaceSelectionError -> Toast.makeText(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.google.android.libraries.places.ktx.api.net.awaitFetchPlace
import com.google.android.libraries.places.ktx.api.net.awaitFindAutocompletePredictions
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
Expand All @@ -44,6 +45,7 @@ class PlacesSearchViewModel @Inject constructor(

private var searchJob: Job? = null

@OptIn(ExperimentalCoroutinesApi::class)
fun onSearchQueryChanged(query: String) {
searchJob?.cancel()

Expand Down Expand Up @@ -75,6 +77,7 @@ class PlacesSearchViewModel @Inject constructor(
}
}

@OptIn(ExperimentalCoroutinesApi::class)
fun onAutocompletePredictionClicked(prediction: AutocompletePrediction) {
val handler = CoroutineExceptionHandler { _, e ->
e.printStackTrace()
Expand All @@ -84,9 +87,9 @@ class PlacesSearchViewModel @Inject constructor(
val place = placesClient.awaitFetchPlace(
prediction.placeId,
listOf(
Place.Field.NAME,
Place.Field.ADDRESS,
Place.Field.LAT_LNG,
Place.Field.DISPLAY_NAME,
Place.Field.FORMATTED_ADDRESS,
Place.Field.LOCATION,
Place.Field.BUSINESS_STATUS
)
)
Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
[versions]
androidCompileSdk = "34"
androidMinSdk = "21"
androidMinSdk = "23"
androidTargetSdk = "34"

appcompat = "1.6.1"
appcompat = "1.7.0"
coreKtx = "1.13.1"
dokkaGradlePlugin = "1.9.20"
fragmentKtx = "1.7.1"
gradle = "8.4.1"
fragmentKtx = "1.8.3"
gradle = "8.6.1"
hiltAndroid = "2.51.1"
jacocoAndroid = "0.2.1"
kotlin = "2.0.0"
kotlinGradlePlugin = "1.9.24"
kotlinx-coroutines-core = "1.8.1"
lifecycle-viewmodel-ktx = "2.8.0"
lifecycle-viewmodel-ktx = "2.8.6"
material = "1.12.0"
playServicesMaps = "18.2.0"
playServicesMaps = "19.0.0"
secretsGradlePlugin = "2.0.1"
truth = "1.4.2"
volley = "1.2.1"
multidex = "2.0.1"
kotlinx-coroutines-play-services = "1.8.1"
places = "3.4.0"
junit-ext = "1.1.5"
test-core = "1.5.0"
places = "4.0.0"
junit-ext = "1.2.1"
test-core = "1.6.1"
mockito-kotlin = "2.2.0"
junit = "4.13.2"
mockito-core = "5.9.0"
mockito-core = "5.11.0"

[libraries]
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 22 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
21 changes: 11 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -42,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit c273ba6

Please sign in to comment.