Skip to content

Commit 0f58713

Browse files
committed
test fix
1 parent dd42c63 commit 0f58713

10 files changed

Lines changed: 56 additions & 189 deletions

File tree

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 116 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 5 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
3+
}
24

35
android {
46
compileSdkVersion 30
5-
buildToolsVersion "29.0.3"
7+
68
defaultConfig {
79
applicationId "com.example.osmnavigationapp"
810
minSdkVersion 15
@@ -11,15 +13,17 @@ android {
1113
versionName "1.0"
1214
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1315
}
16+
1417
buildTypes {
1518
release {
1619
minifyEnabled false
1720
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1821
}
1922
}
23+
2024
compileOptions {
21-
sourceCompatibility = 1.8
22-
targetCompatibility = 1.8
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
2327
}
2428
}
2529

@@ -32,5 +36,6 @@ dependencies {
3236
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3337

3438
// baato library
35-
implementation project(':baatolibrary')
39+
// implementation project(':baatolibrary')
40+
implementation 'com.github.baato:java-client:1.2.5'
3641
}

baatolibrary/build.gradle

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ android {
77
compileSdkVersion 32
88
buildToolsVersion "29.0.3"
99

10+
// buildFeatures {
11+
// viewBinding = true
12+
// }
13+
//
1014
defaultConfig {
1115
minSdkVersion 15
1216
targetSdkVersion 32
@@ -16,13 +20,27 @@ android {
1620
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1721
consumerProguardFiles 'consumer-rules.pro'
1822
}
19-
23+
//
2024
buildTypes {
2125
release {
2226
minifyEnabled false
2327
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2428
}
2529
}
30+
compileOptions {
31+
sourceCompatibility JavaVersion.VERSION_1_8
32+
targetCompatibility JavaVersion.VERSION_1_8
33+
}
34+
// kotlinOptions {
35+
// jvmTarget = '1.8'
36+
// }
37+
// publishing {
38+
// singleVariant('release') {
39+
// withSourcesJar()
40+
// withJavadocJar()
41+
// }
42+
// }
43+
namespace 'com.baato.baatolibrary'
2644
}
2745

2846
dependencies {
@@ -54,6 +72,10 @@ publishing {
5472
groupId = 'com.github.baato'
5573
artifactId = 'java-client'
5674
version = '1.4.0'
75+
76+
afterEvaluate {
77+
from components.release
78+
}
5779
}
5880
}
5981
}

baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.baato.baatolibrary.application.BaatoLib;
99
import com.graphhopper.util.Helper;
1010
import com.graphhopper.util.Translation;
11-
import com.kathmandulivinglabs.navigationlibrary.R;
1211

1312
import java.io.IOException;
1413
import java.io.InputStream;

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ buildscript {
77

88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.5.4'
10+
classpath 'com.android.tools.build:gradle:7.0.2'
11+
1112
// NOTE: Do not place your application dependencies here; they belong
1213
// in the individual module build.gradle files
1314
// classpath 'digital.wup:android-maven-publish:3.6.0'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

settings.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
1+
//dependencyResolutionManagement {
2+
// repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
3+
// repositories {
4+
// google()
5+
// mavenCentral()
6+
//
7+
// maven { url 'https://jitpack.io' }
8+
// maven { url 'https://mapbox.bintray.com/mapbox' }
9+
// maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
10+
// }
11+
//}
12+
113
include ':app', ':baatolibrary'
214
rootProject.name='OSM Navigation App'

0 commit comments

Comments
 (0)