Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating google location service #369

Merged
merged 30 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b2b4995
updating google location service dependency and removing unncessary m…
aurangzaibumer Apr 29, 2024
f19d418
update version number to publish artifact
aurangzaibumer Apr 29, 2024
7c66e27
Revert mapbox sdk key on gradle.properties
aurangzaibumer Apr 29, 2024
1f52503
removed unneccessary changes
aurangzaibumer Apr 29, 2024
a1a8398
removed developer-config file
aurangzaibumer Apr 29, 2024
c7bdcfe
Merge branch 'master' into updating-google-location-service
dubdabasoduba Apr 30, 2024
9307b0d
Update the utils and libs version
dubdabasoduba May 1, 2024
8c2bb76
:wrench: Remove unused file
dubdabasoduba May 1, 2024
4249ad8
:arrow_up: Update min sdk version
dubdabasoduba May 3, 2024
47f2adb
:arrow_up: Update the Kujaku dependencies
dubdabasoduba May 8, 2024
b5e3693
:arrow_up: Upgrade the kujaku dependencies and publish snapshots
dubdabasoduba May 9, 2024
1610f05
Update library.yml to JDK 17
ndegwamartin Jul 1, 2024
fe6cbe0
Update ci.yml to JDK 17
ndegwamartin Jul 1, 2024
0bb698a
Update utils.yml to JDK 17
ndegwamartin Jul 1, 2024
2a955ee
Merge pull request #370 from onaio/ndegwamartin-patch-1
ndegwamartin Jul 1, 2024
2547c2a
Pin CI workflow Runner to MacOS 13
ndegwamartin Jul 2, 2024
28edb1d
Upgrade Robolectric Version
ndegwamartin Jul 2, 2024
91b5ed7
Add missing Robolectric Artifact
ndegwamartin Jul 2, 2024
e55c20d
Run tests on API 30
ndegwamartin Jul 3, 2024
1e6049e
Update Run Instrumented Tests workflow configuration
ndegwamartin Jul 3, 2024
5302bc6
Update Run Instrumented Tests workflow configuration
ndegwamartin Jul 3, 2024
d7efa4f
Resolve permission location for higher android builds.
Lentumunai-Mark Aug 9, 2024
7569358
Update Artifact Release Version for QA
ndegwamartin Aug 9, 2024
724ffbd
Update library.yml : Temporary Disable test for Artifacts
ndegwamartin Aug 12, 2024
0b56f7c
Update release version and undo finish activity.
Lentumunai-Mark Aug 13, 2024
c705b26
Merge pull request #373 from onaio/update-storage-permissions
ellykits Aug 14, 2024
a35cc73
:arrow_up: Update utils version
dubdabasoduba Aug 14, 2024
4ac8457
:arrow_up: Update the utils version on library
dubdabasoduba Aug 16, 2024
ca34a4c
:arrow_up: Upgrade kujaku to 0.10.5
dubdabasoduba Aug 16, 2024
03e75b6
:rewind: Revert publish mode on kujaku lib
dubdabasoduba Aug 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ allprojects {
password = localProperties['mapbox.repo.token'] ?: ""
}
}
maven{url "https://oss.sonatype.org/content/repositories/snapshots"}
maven{url "https://s01.oss.sonatype.org/content/repositories/snapshots"}
}

}
Expand Down
3 changes: 1 addition & 2 deletions download-robolectric-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/11-robolectr

cp robolectric-deps.properties library/src/test/resources
cp robolectric-deps.properties utils/src/test/resources
cp robolectric-deps.properties sample/src/test/resources
cp robolectric-deps.properties wrapper/src/test/resources
cp robolectric-deps.properties sample/src/test/resources
9 changes: 5 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: 'jacoco'

buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
Expand All @@ -14,7 +15,7 @@ apply plugin: 'realm-android'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'maven-publish'

version '0.10.0'
version '0.10.2-SNAPSHOT'

project.version = this.version

Expand All @@ -33,7 +34,7 @@ android {
}

defaultConfig {
minSdkVersion 16
minSdkVersion 19
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName this.version
Expand Down Expand Up @@ -118,7 +119,7 @@ dependencies { configuration ->
// Comment the line below when creating releases - The line is for development of the library & utils
implementation (project(":utils")) {
// Uncomment the line below when creating releases
//implementation('io.ona.kujaku:utils:0.9.0') {
//implementation('io.ona.kujaku:utils:0.10.2-SNAPSHOT') {
transitive = true;
exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
exclude group: 'com.android.support', module: 'support-v4'
Expand Down Expand Up @@ -173,7 +174,7 @@ private static void appPermissionsDependencies(configuration) {
}

private static void locationDependencies(configuration) {
configuration.implementation 'com.google.android.gms:play-services-location:19.0.1'
configuration.implementation 'com.google.android.gms:play-services-location:21.2.0'
}

tasks.withType(Test) {
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {

defaultConfig {
applicationId "io.ona.kujaku.sample"
minSdkVersion 16
minSdkVersion 21
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode getMasterCommitCount()
versionName getVersionName()
Expand Down
6 changes: 6 additions & 0 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ona.kujaku.sample">

<!-- Always include this permission -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

<!-- Include only if your app benefits from precise location access. -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

<application
android:name=".MyApplication"
android:allowBackup="true"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':library', ':sample', ':wrapper', ':utils'
include ':library', ':sample', ':utils'
4 changes: 2 additions & 2 deletions utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray'
apply plugin: 'maven-publish'
apply plugin: 'jacoco'

version '0.9.0'
version '0.10.2-SNAPSHOT'
project.version = this.version


Expand All @@ -22,7 +22,7 @@ android {
}

defaultConfig {
minSdkVersion 16
minSdkVersion 19
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName this.version
Expand Down
1 change: 0 additions & 1 deletion wrapper/.gitignore

This file was deleted.

87 changes: 0 additions & 87 deletions wrapper/build.gradle

This file was deleted.

25 changes: 0 additions & 25 deletions wrapper/proguard-rules.pro

This file was deleted.

27 changes: 0 additions & 27 deletions wrapper/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions wrapper/src/main/res/layout/activity_offline_map_downloder.xml

This file was deleted.

Binary file removed wrapper/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed wrapper/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed wrapper/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
6 changes: 0 additions & 6 deletions wrapper/src/main/res/values/colors.xml

This file was deleted.

3 changes: 0 additions & 3 deletions wrapper/src/main/res/values/strings.xml

This file was deleted.

11 changes: 0 additions & 11 deletions wrapper/src/main/res/values/styles.xml

This file was deleted.

17 changes: 0 additions & 17 deletions wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java

This file was deleted.

Loading