Skip to content

Commit

Permalink
test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Ichchhie committed Jan 23, 2023
1 parent dd42c63 commit 0f58713
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 189 deletions.
116 changes: 0 additions & 116 deletions .idea/codeStyles/Project.xml

This file was deleted.

3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 2 additions & 52 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
}

Expand All @@ -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'
}
24 changes: 23 additions & 1 deletion baatolibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ android {
compileSdkVersion 32
buildToolsVersion "29.0.3"

// buildFeatures {
// viewBinding = true
// }
//
defaultConfig {
minSdkVersion 15
targetSdkVersion 32
Expand All @@ -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 {
Expand Down Expand Up @@ -54,6 +72,10 @@ publishing {
groupId = 'com.github.baato'
artifactId = 'java-client'
version = '1.4.0'

afterEvaluate {
from components.release
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 12 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit 0f58713

Please sign in to comment.