mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-10-27 04:43:54 +01:00 
			
		
		
		
	 7476b0a24d
			
		
	
	
		7476b0a24d
		
			
		
	
	
	
	
		
			
			* 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>
		
			
				
	
	
		
			35 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			Properties
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			Properties
		
	
	
	
	
	
| ## Project-wide Gradle settings.
 | |
| #
 | |
| # For more details on how to configure your build environment visit
 | |
| # http://www.gradle.org/docs/current/userguide/build_environment.html
 | |
| #
 | |
| # Specifies the JVM arguments used for the daemon process.
 | |
| # The setting is particularly useful for tweaking memory settings.
 | |
| # Default value: -Xmx1024m -XX:MaxPermSize=256m
 | |
| # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 | |
| #
 | |
| # When configured, Gradle will run in incubating parallel mode.
 | |
| # This option should only be used with decoupled projects. More details, visit
 | |
| # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 | |
| # org.gradle.parallel=true
 | |
| #Thu Mar 01 15:28:48 IST 2018
 | |
| org.gradle.jvmargs=-Xmx1536M
 | |
| android.enableBuildCache=true
 | |
| 
 | |
| KOTLIN_VERSION=1.5.10
 | |
| BUTTERKNIFE_VERSION=10.1.0
 | |
| LEAK_CANARY_VERSION=1.6.2
 | |
| DAGGER_VERSION=2.23
 | |
| ROOM_VERSION=2.3.0
 | |
| PREFERENCE_VERSION=1.1.0
 | |
| CORE_KTX_VERSION=1.2.0
 | |
| ADAPTER_DELEGATES_VERSION=4.3.0
 | |
| PAGING_VERSION=2.1.2
 | |
| MULTIDEX_VERSION=2.0.1
 | |
| OKHTTP_VERSION=3.12.1
 | |
| 
 | |
| systemProp.http.proxyPort=0
 | |
| systemProp.http.proxyHost=
 | |
| android.useAndroidX=true
 | |
| android.enableJetifier=true
 | |
| android.enableR8=false
 |