Skip to content

at-725-apostrophe-validation #5

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

at-725-apostrophe-validation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04b57ce
upgrade gradle version
maulidkategile Jun 26, 2022
14b8446
allow apostrophe
maulidkategile Jun 27, 2022
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: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ subprojects {

group = 'org.smartregister'

ext.androidToolsBuildGradle = '3.1.4'
ext.androidToolsBuildGradle = '4.2.0'
ext.androidBuildToolsVersion = '28.0.3'
ext.androidMinSdkVersion = 18
ext.androidCompileSdkVersion = 28
Expand Down
10 changes: 5 additions & 5 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#Tue May 15 18:45:24 EAT 2018
org.gradle.daemon=true
#Fri Jun 24 14:49:50 EAT 2022
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
org.gradle.daemon=true
org.gradle.parallel=true
zipStoreBase=GRADLE_USER_HOME
org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
org.gradle.configureondemand=true
distributionPath=wrapper/dists
distributionBase=GRADLE_USER_HOME
8 changes: 4 additions & 4 deletions opensrp-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,11 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
def debugTree = fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: fileFilter)
def mainSrc = "$project.projectDir/src/main/java"

sourceDirectories = files([mainSrc])
classDirectories = files([debugTree])
executionData = fileTree(dir: project.buildDir, includes: [
sourceDirectories.setFrom(files([mainSrc]))
classDirectories.setFrom(files([debugTree]))
executionData.setFrom(fileTree(dir: project.buildDir, includes: [
'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec'
])
]))
}

coveralls {
Expand Down
1 change: 0 additions & 1 deletion opensrp-app/src/main/java/org/smartregister/repository/EventClientRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,6 @@ public Client fetchClientByBaseEntityId(String baseEntityId) {
+ " = ? ", new String[]{baseEntityId});
if (cursor.moveToNext()) {
String jsonString = cursor.getString(0);
jsonString = jsonString.replaceAll("'", "");
return convert(jsonString, Client.class);
}
} catch (Exception e) {
Expand Down
1 change: 1 addition & 0 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ android {
checkReleaseBuilds false
abortOnError false
}

}


Expand Down