Remove ineffective libVersion from extension config (#808)
				
					
				
			This commit is contained in:
		
							parent
							
								
									9f21ec0d06
								
							
						
					
					
						commit
						4f1e8b8c4f
					
				| @ -250,10 +250,9 @@ apply from: "$rootDir/common.gradle" | |||||||
| | `extName`        | The name of the extension. Should be romanized if site name is not in English.                                                                                                         | | | `extName`        | The name of the extension. Should be romanized if site name is not in English.                                                                                                         | | ||||||
| | `extClass`       | Points to the class that implements `Source`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). | | | `extClass`       | Points to the class that implements `Source`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). | | ||||||
| | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code.                                                                               | | | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code.                                                                               | | ||||||
| | `libVersion`     | (Optional, defaults to `1.4`) The version of the [extensions library](https://github.com/tachiyomiorg/extensions-lib) used.                                                            | |  | ||||||
| | `isNsfw`         | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content.                                                                                                  | | | `isNsfw`         | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content.                                                                                                  | | ||||||
| 
 | 
 | ||||||
| The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. | The extension's version name is generated automatically by concatenating `1.4` and `extVersionCode`. | ||||||
| With the example used above, the version would be `1.4.1`. | With the example used above, the version would be `1.4.1`. | ||||||
| 
 | 
 | ||||||
| ### Core dependencies | ### Core dependencies | ||||||
|  | |||||||
| @ -3,6 +3,9 @@ apply plugin: 'kotlin-android' | |||||||
| apply plugin: 'kotlinx-serialization' | apply plugin: 'kotlinx-serialization' | ||||||
| apply plugin: 'org.jmailen.kotlinter' | apply plugin: 'org.jmailen.kotlinter' | ||||||
| 
 | 
 | ||||||
|  | assert !ext.has("pkgNameSuffix") | ||||||
|  | assert !ext.has("libVersion") | ||||||
|  | 
 | ||||||
| android { | android { | ||||||
|     compileSdk AndroidConfig.compileSdk |     compileSdk AndroidConfig.compileSdk | ||||||
| 
 | 
 | ||||||
| @ -21,14 +24,15 @@ android { | |||||||
|         targetSdk AndroidConfig.targetSdk |         targetSdk AndroidConfig.targetSdk | ||||||
|         applicationIdSuffix project.parent.name + "." + project.name |         applicationIdSuffix project.parent.name + "." + project.name | ||||||
|         versionCode extVersionCode |         versionCode extVersionCode | ||||||
|         versionName project.ext.properties.getOrDefault("libVersion", "1.4") + ".$extVersionCode" |         versionName "1.4.$versionCode" | ||||||
|         base { |         base { | ||||||
|             archivesName = "tachiyomi-$applicationIdSuffix-v$versionName" |             archivesName = "tachiyomi-$applicationIdSuffix-v$versionName" | ||||||
|         } |         } | ||||||
|  |         assert extClass.startsWith(".") | ||||||
|         manifestPlaceholders = [ |         manifestPlaceholders = [ | ||||||
|                 appName : "Tachiyomi: $extName", |                 appName : "Tachiyomi: $extName", | ||||||
|                 extClass: extClass, |                 extClass: extClass, | ||||||
|                 nsfw: project.ext.properties.getOrDefault("isNsfw", false) ? 1 : 0, |                 nsfw: ext.find("isNsfw") ? 1 : 0, | ||||||
|         ] |         ] | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 stevenyomi
						stevenyomi