Skip to content

Commit 68efa2c

Browse files
authored
Hotfix jitpack release (#6)
add maven-publish plugin as per new policy of jitpack, upgrade gradle dependency
1 parent 86518be commit 68efa2c

File tree

12 files changed

+62
-194
lines changed

12 files changed

+62
-194
lines changed

.idea/codeStyles/Project.xml

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

.idea/compiler.xml

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

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
3+
}
24

35
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
6+
compileSdkVersion 30
7+
68
defaultConfig {
79
applicationId "com.example.osmnavigationapp"
810
minSdkVersion 15
9-
targetSdkVersion 29
11+
targetSdkVersion 30
1012
versionCode 1
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

@@ -33,4 +37,5 @@ dependencies {
3337

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

baatolibrary/build.gradle

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
apply plugin: 'com.android.library'
1+
plugins {
2+
id 'com.android.library'
3+
id 'maven-publish'
4+
}
25

36
android {
47
compileSdkVersion 32
58
buildToolsVersion "29.0.3"
69

7-
810
defaultConfig {
911
minSdkVersion 15
1012
targetSdkVersion 32
@@ -21,6 +23,12 @@ android {
2123
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2224
}
2325
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_1_8
28+
targetCompatibility JavaVersion.VERSION_1_8
29+
}
30+
31+
namespace 'com.baato.baatolibrary'
2432
}
2533

2634
dependencies {
@@ -44,4 +52,18 @@ dependencies {
4452

4553
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.1'
4654
implementation 'commons-codec:commons-codec:1.14'
47-
}
55+
}
56+
57+
publishing {
58+
publications {
59+
release(MavenPublication) {
60+
groupId = 'com.github.baato'
61+
artifactId = 'java-client'
62+
version = '1.4.5'
63+
64+
afterEvaluate {
65+
from components.release
66+
}
67+
}
68+
}
69+
}

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ buildscript {
44
repositories {
55
google()
66
mavenCentral()
7-
7+
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
13-
classpath 'digital.wup:android-maven-publish:3.6.0'
1414
}
1515
}
1616

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
20+
android.disableAutomaticComponentCreation=true
2021

0 commit comments

Comments
 (0)