diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100755 index 681f41a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 657129d..84ed853 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,13 +1,12 @@ - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 16ed519..4bc4fc6 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,55 +1,5 @@ - - - - - - - - - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 21dd9e0..87ab950 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { compileSdkVersion 30 - buildToolsVersion "29.0.3" + defaultConfig { applicationId "com.example.osmnavigationapp" minSdkVersion 15 @@ -11,15 +13,17 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } @@ -32,5 +36,6 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' // baato library - implementation project(':baatolibrary') +// implementation project(':baatolibrary') + implementation 'com.github.baato:java-client:1.2.5' } diff --git a/baatolibrary/build.gradle b/baatolibrary/build.gradle index 54dc7a5..63b9f90 100755 --- a/baatolibrary/build.gradle +++ b/baatolibrary/build.gradle @@ -7,6 +7,10 @@ android { compileSdkVersion 32 buildToolsVersion "29.0.3" +// buildFeatures { +// viewBinding = true +// } +// defaultConfig { minSdkVersion 15 targetSdkVersion 32 @@ -16,13 +20,27 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } - +// buildTypes { release { minifyEnabled 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' +// } +// publishing { +// singleVariant('release') { +// withSourcesJar() +// withJavadocJar() +// } +// } + namespace 'com.baato.baatolibrary' } dependencies { @@ -54,6 +72,10 @@ publishing { groupId = 'com.github.baato' artifactId = 'java-client' version = '1.4.0' + + afterEvaluate { + from components.release + } } } } diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java index 9cd9792..0e85008 100755 --- a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java +++ b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java @@ -8,7 +8,6 @@ import com.baato.baatolibrary.application.BaatoLib; import com.graphhopper.util.Helper; import com.graphhopper.util.Translation; -import com.kathmandulivinglabs.navigationlibrary.R; import java.io.IOException; import java.io.InputStream; diff --git a/build.gradle b/build.gradle index 52f99a4..16edf32 100755 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:7.0.2' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files // classpath 'digital.wup:android-maven-publish:3.6.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f1fd07..cb28952 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/settings.gradle b/settings.gradle index 67afe1b..dde6731 100755 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,14 @@ +//dependencyResolutionManagement { +// repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) +// repositories { +// google() +// mavenCentral() +// +// maven { url 'https://jitpack.io' } +// maven { url 'https://mapbox.bintray.com/mapbox' } +// maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } +// } +//} + include ':app', ':baatolibrary' rootProject.name='OSM Navigation App'