mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-11-04 08:43:52 +01:00 
			
		
		
		
	* Cherry-Picked NPE fix from master (#4569) * Fix notification bug #4547 (#4570) * Make Single Query for Nearby and WLM pins (#4573) * Merge nearby and monument queries * Bug Fix- query resource path change on shouldQueryForMonuments * Bug Fixes 1. Propagate exceptions for nearby API calls to caller 2. Fix too much work on main thread exception in NearbyParentFragment * Modify parameters for Nearby query * Bug fix- current location marker (#4580) * Move WLM template below geolocation template (#4582) * Modify string for WLM upload notice * Fix bug #4583 (#4591) * Fix bug #4585 by updating kotlin and acra version (#4592) * Fixes #4554 - only use WLM2021 template for countries that are included in it (#4574) * Fixes #4554 1. For WLM uploads reverse geo code and see if the country code is supported -only then is the WLM upload flow triggered, otherwise usual nearby uploads happen 2. Bug Fix - Current Location marker and area * Fixed compile error added after rebasing * Bug fix for country code in reverse geo code * Update WLM camaign dates [Do not merge now, merge only after alpha release] (#4584) * Updates dates for WML campaign * Bug fix- campaign dates * Fixed logic for WLM enablement - stick to the month of September * Add countries supported by WLM2021 template, except Italy * Versioning for v3.1.0 * Update changelog.md * Fix empty default lang bug (#4608) * Fix bug #4583 * Fix empty default lang bug * Fixes #4595 - Updated nearby query (#4622) * Fixes #4595 - Updated nearby query * Removed logic to replace local language in nearby query - that might acccidentally replace other strings * Fetch property location in usual nearby query * Remove duplicate line (#4626) * Change "learn more" link to new wiki * Add Sweden's P3426 to property filter * Fixes #4601 - 1. Handle possible exceptions in upload file from stash 2. Modify MWException, as error is nullable, update getTitle and getMessage to rever that (#4627) * Versioning for v3.1.1 * Update changelog.md * Updated DB version to rever integrity Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Co-authored-by: Josephine Lim <josephinelim86@gmail.com>
		
			
				
	
	
		
			147 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Groovy
		
	
	
	
	
	
			
		
		
	
	
			147 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Groovy
		
	
	
	
	
	
buildscript {
 | 
						|
    ext.kotlin_version = '1.5.10'
 | 
						|
    repositories {
 | 
						|
        jcenter()
 | 
						|
        google()
 | 
						|
    }
 | 
						|
    dependencies {
 | 
						|
        classpath 'com.android.tools.build:gradle:3.6.3'
 | 
						|
        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
 | 
						|
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
plugins {
 | 
						|
    id "com.jfrog.bintray" version "1.7.3"
 | 
						|
}
 | 
						|
 | 
						|
allprojects {
 | 
						|
    repositories {
 | 
						|
        google()
 | 
						|
        jcenter()
 | 
						|
    }
 | 
						|
    apply plugin: 'com.android.library'
 | 
						|
    apply plugin: 'kotlin-android'
 | 
						|
    apply plugin: 'kotlin-android-extensions'
 | 
						|
 | 
						|
    apply plugin: 'com.github.dcendents.android-maven'
 | 
						|
    apply plugin: 'com.jfrog.bintray'
 | 
						|
}
 | 
						|
 | 
						|
version = "${VERSION_NAME}"
 | 
						|
group = "${GROUP_ID}"
 | 
						|
 | 
						|
android {
 | 
						|
    compileSdkVersion 28
 | 
						|
 | 
						|
    defaultConfig {
 | 
						|
        minSdkVersion 19
 | 
						|
        targetSdkVersion 28
 | 
						|
        versionCode 1
 | 
						|
        versionName "${VERSION_NAME}"
 | 
						|
 | 
						|
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 | 
						|
    }
 | 
						|
    buildTypes {
 | 
						|
        release {
 | 
						|
            minifyEnabled false
 | 
						|
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 | 
						|
        }
 | 
						|
    }
 | 
						|
    lintOptions {
 | 
						|
        abortOnError false
 | 
						|
    }
 | 
						|
    compileOptions {
 | 
						|
        sourceCompatibility = '1.8'
 | 
						|
        targetCompatibility = '1.8'
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
dependencies {
 | 
						|
 | 
						|
    String retrofitVersion = '2.4.0'
 | 
						|
 | 
						|
    implementation fileTree(dir: 'libs', include: ['*.jar'])
 | 
						|
 | 
						|
    implementation "androidx.core:core:1.0.2"
 | 
						|
    implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
 | 
						|
    implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
 | 
						|
    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
 | 
						|
    implementation "io.reactivex.rxjava2:rxjava:2.2.3"
 | 
						|
    implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
 | 
						|
    implementation 'org.apache.commons:commons-lang3:3.8.1'
 | 
						|
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 | 
						|
 | 
						|
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 | 
						|
 | 
						|
    testImplementation 'junit:junit:4.12'
 | 
						|
    testImplementation 'org.mockito:mockito-core:2.8.9'
 | 
						|
    testImplementation 'org.robolectric:robolectric:3.8'
 | 
						|
    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.1"
 | 
						|
    testImplementation "commons-io:commons-io:2.6"
 | 
						|
}
 | 
						|
 | 
						|
task sourcesJar(type: Jar) {
 | 
						|
    from android.sourceSets.main.java.srcDirs
 | 
						|
    classifier = 'sources'
 | 
						|
}
 | 
						|
artifacts {
 | 
						|
    archives sourcesJar
 | 
						|
}
 | 
						|
 | 
						|
Properties properties = new Properties()
 | 
						|
if ( project.rootProject.file('local.properties').isFile() ) {
 | 
						|
    properties.load(project.rootProject.file('local.properties').newDataInputStream())
 | 
						|
}
 | 
						|
 | 
						|
bintray {
 | 
						|
    user = properties.getProperty("bintray.user")
 | 
						|
    key = properties.getProperty("bintray.apikey")
 | 
						|
	println 'Bintray user: ' + user
 | 
						|
    configurations = ['archives']
 | 
						|
    pkg {
 | 
						|
        repo = 'maven'
 | 
						|
        name = "${ARTIFACT_ID}"
 | 
						|
        vcsUrl = 'https://github.com/wikimedia/wikimedia-android-data-client.git'
 | 
						|
        licenses = ['Apache-2.0']
 | 
						|
        version {
 | 
						|
            name = "${VERSION_NAME}"
 | 
						|
        }
 | 
						|
        publish = true
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
install {
 | 
						|
    repositories.mavenInstaller {
 | 
						|
        // This generates POM.xml with proper parameters
 | 
						|
        pom {
 | 
						|
            project {
 | 
						|
                packaging 'aar'
 | 
						|
 | 
						|
                name "${ARTIFACT_ID}"
 | 
						|
                artifactId "${ARTIFACT_ID}"
 | 
						|
                description 'Android library for accessing the Wikimedia APIs.'
 | 
						|
                url 'https://github.com/wikimedia/wikimedia-android-data-client'
 | 
						|
                inceptionYear '2019'
 | 
						|
 | 
						|
                licenses {
 | 
						|
                    license {
 | 
						|
                        name 'The Apache Software License, Version 2.0'
 | 
						|
                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
 | 
						|
                    }
 | 
						|
                }
 | 
						|
                developers {
 | 
						|
                    developer {
 | 
						|
                        id 'dmitrybrant'
 | 
						|
                        name 'Dmitry Brant'
 | 
						|
                        email 'me@dmitrybrant.com'
 | 
						|
                    }
 | 
						|
                }
 | 
						|
            }
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
repositories {
 | 
						|
    mavenCentral()
 | 
						|
}
 |