diff --git a/build.gradle b/build.gradle
index d3542b0..de88b5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-  id 'com.android.application' version '7.2.1' apply false
-  id 'com.android.library' version '7.2.1' apply false
+  id 'com.android.application' version '7.4.2' apply false
+  id 'com.android.library' version '7.4.2' apply false
 }
 
 project.ext {
   minSdkVersion = 21
-  targetSdkVersion = 31
-  buildToolsVersion = '32.0.0'
+  targetSdkVersion = 33
+  buildToolsVersion = '33.0.2'
   javaVersion = JavaVersion.VERSION_11
 }
 
 task clean(type: Delete) {
   delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7f5ecd9..713a4c3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 06 09:48:49 TRT 2022
+#Fri Mar 24 10:19:21 EET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/lib/build.gradle b/lib/build.gradle
index 146a15c..1c40766 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+  namespace 'app.organicmaps.api'
   compileSdk project.targetSdkVersion
 
   defaultConfig {
@@ -25,8 +26,11 @@ android {
   }
 }
 
-dependencies {
+tasks.withType(JavaCompile) {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}
 
-  implementation 'androidx.appcompat:appcompat:1.4.2'
-  implementation 'com.google.android.material:material:1.6.1'
-}
\ No newline at end of file
+dependencies {
+  implementation 'androidx.appcompat:appcompat:1.6.1'
+  implementation 'com.google.android.material:material:1.8.0'
+}
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index c38e16e..15414f2 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="app.organicmaps.api"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <queries>
     <package android:name="app.organicmaps"/>
     <package android:name="com.mapswithme.maps"/>
diff --git a/sample-app-capitals/build.gradle b/sample-app-capitals/build.gradle
index 4ba03e1..5b6bc98 100644
--- a/sample-app-capitals/build.gradle
+++ b/sample-app-capitals/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+  namespace 'app.organicmaps.api.sample.capitals'
   compileSdk project.targetSdkVersion
 
   defaultConfig {
@@ -26,8 +27,12 @@ android {
   }
 }
 
+tasks.withType(JavaCompile) {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}
+
 dependencies {
-  implementation 'androidx.appcompat:appcompat:1.4.2'
-  implementation 'com.google.android.material:material:1.6.1'
+  implementation 'androidx.appcompat:appcompat:1.6.1'
+  implementation 'com.google.android.material:material:1.8.0'
   implementation project(path: ':lib')
 }
\ No newline at end of file
diff --git a/sample-app-capitals/src/main/AndroidManifest.xml b/sample-app-capitals/src/main/AndroidManifest.xml
index fafe43e..093834e 100644
--- a/sample-app-capitals/src/main/AndroidManifest.xml
+++ b/sample-app-capitals/src/main/AndroidManifest.xml
@@ -21,8 +21,7 @@
   OF SUCH DAMAGE.
 -->
 
-<manifest package="app.organicmaps.api.sample.capitals"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
diff --git a/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java
index 2ae5374..1636503 100644
--- a/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java
+++ b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2022, Organic Maps OÜ. All rights reserved.
+ Copyright (c) 2022-2023, Organic Maps OÜ. All rights reserved.
  Copyright (c) 2013, MapsWithMe GmbH. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without modification,
@@ -57,16 +57,16 @@ public class CityDetailsActivity extends Activity
     super.onCreate(savedInstanceState);
     setContentView(R.layout.city_details_activity);
 
-    mName = (TextView) findViewById(R.id.name);
-    mAltNames = (TextView) findViewById(R.id.altNames);
-    mCountry = (TextView) findViewById(R.id.cCode);
+    mName = findViewById(R.id.name);
+    mAltNames = findViewById(R.id.altNames);
+    mCountry = findViewById(R.id.cCode);
 
-    mLat = (TextView) findViewById(R.id.lat);
-    mLon = (TextView) findViewById(R.id.lon);
-    mElev = (TextView) findViewById(R.id.elevation);
+    mLat = findViewById(R.id.lat);
+    mLon = findViewById(R.id.lon);
+    mElev = findViewById(R.id.elevation);
 
-    mPopulation = (TextView) findViewById(R.id.population);
-    mTimeZone = (TextView) findViewById(R.id.timeZone);
+    mPopulation = findViewById(R.id.population);
+    mTimeZone = findViewById(R.id.timeZone);
 
     findViewById(R.id.showOnMap).setOnClickListener(v -> {
       final Intent intent = new MapRequest()
diff --git a/sample-pick-point/build.gradle b/sample-pick-point/build.gradle
index 0db6b58..ec02207 100644
--- a/sample-pick-point/build.gradle
+++ b/sample-pick-point/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+  namespace 'app.organicmaps.api.sample.pick_point'
   compileSdk project.targetSdkVersion
 
   defaultConfig {
@@ -26,7 +27,11 @@ android {
   }
 }
 
+tasks.withType(JavaCompile) {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}
+
 dependencies {
-  implementation 'com.google.android.material:material:1.6.1'
+  implementation 'com.google.android.material:material:1.8.0'
   implementation project(path: ':lib')
 }
\ No newline at end of file
diff --git a/sample-pick-point/src/main/AndroidManifest.xml b/sample-pick-point/src/main/AndroidManifest.xml
index a322646..e67fd76 100644
--- a/sample-pick-point/src/main/AndroidManifest.xml
+++ b/sample-pick-point/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="app.organicmaps.api.sample.pick_point"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"