Remove remnants of old JARRemapper plugin, fix dependency issue

pocolifo · Mar 22, 2023 · fe00844 · fe00844
1 parent c9d33c7
commit fe00844
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 74 deletions.
diff --git a/com.pocolifo.jarremapper.extensions/build.gradle b/com.pocolifo.jarremapper.extensions/build.gradle
@@ -14,15 +14,11 @@ repositories {
     maven {
         url 'https://maven.fabricmc.net'
     }
-
-    maven {
-        url 'https://maven.services.pocolifo.com/releases'
-    }
 }
 
 dependencies {
-    implementation 'com.pocolifo:jarremapper:2.0.2'
-    implementation 'net.fabricmc:tiny-remapper:0.8.1'
+    implementation project(':com.pocolifo.jarremapper')
+    implementation 'net.fabricmc:tiny-remapper:0.8.6'
     implementation 'net.md-5:SpecialSource:1.11.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
@@ -33,31 +29,6 @@ test {
     useJUnitPlatform()
 }
 
-//jarremapper {
-//    mappings = [
-//            'mcp/stable/1.8.9/22',
-//            'legacyfabric/1.8.9/202112162000',
-//            'fabric/1.18.1/1'
-//    ]
-//
-//    minecraft = ['client/1.8.9/3870888a6c3d349d3771a3e9d16c9bf5e076b908',
-//                 'client/1.18.1/7e46fb47609401970e2818989fa584fd467cd036']
-//
-//    readers = ['com.pocolifo.jarremapper.reader.mcp.McpMappingReader/.read()/mcp': ['joined.srg', 'joined.exc', 'methods.csv', 'fields.csv', 'params.csv'],
-//               'com.pocolifo.jarremapper.reader.tiny.Tiny1MappingReader/.read(\"official\", \"named\")/fabric+legacyfabric': ['mappings.tiny'],
-//               'com.pocolifo.jarremapper.reader.tiny.Tiny2MappingReader/.read(\"official\", \"named\")/fabric+legacyfabric': ['mappings-merged.tiny']]
-//
-//    engines = [
-//            // Tiny remapper
-//            'com.pocolifo.jarremapper.extensions.TinyRemapperEngine/new TinyRemapperEngine().setOptions(net.fabricmc.tinyremapper.TinyRemapper.newRemapper().ignoreConflicts(true))',
-//            'com.pocolifo.jarremapper.extensions.TinyRemapperEngine/new TinyRemapperEngine().setOptions(net.fabricmc.tinyremapper.TinyRemapper.newRemapper().ignoreConflicts(true)).excludeMetaInf()',
-//
-//            // Special source
-//            'com.pocolifo.jarremapper.extensions.SpecialSourceEngine/new SpecialSourceEngine()',
-//            'com.pocolifo.jarremapper.extensions.SpecialSourceEngine/new SpecialSourceEngine().excludeMetaInf()'
-//    ]
-//}
-
 publishing {
     publications {
         maven(MavenPublication) {

diff --git a/com.pocolifo.jarremapper/build.gradle b/com.pocolifo.jarremapper/build.gradle
@@ -24,49 +24,6 @@ test {
 	useJUnitPlatform()
 }
 
-// jarremapper-dev plugin extension
-// - downloads mappings
-// - downloads input jars
-// - automatically generates tests base on readers, engines, mappings, and input jars
-//jarremapper {
-//	// how to use the jarremapper extension:
-//
-//	// mappings to use.
-//	// mcp format: mcp/<channel>/<minecraft version>/<mappings version>
-//	// yarn (legacyfabric & fabric) format: <(legacyfabric|fabric)>/<minecraft version>/<build id>
-//	mappings = [
-//			// mcp
-//			'mcp/stable/1.8.9/22',
-//
-//			// legacyfabric
-//			'legacyfabric/1.8.9/202112162000',
-//
-//			// fabric
-//			'fabric/1.18.1/1'
-//	]
-//
-//	// minecraft binaries to use.
-//	// format: <(client|server)>/<minecraft version>/<binary hash>
-//	minecraft = ['client/1.8.9/3870888a6c3d349d3771a3e9d16c9bf5e076b908',
-//				 'client/1.18.1/7e46fb47609401970e2818989fa584fd467cd036']
-//
-//	// mapping readers to generate tests for.
-//	// format: <canonical path of reader class>/<how to obtain a JarMapping>/<mappings this applies to>(+<more mappings>+...): [<files required for constructing>]
-//	readers = ['com.pocolifo.jarremapper.reader.mcp.McpMappingReader/.read()/mcp': ['joined.srg', 'joined.exc', 'methods.csv', 'fields.csv', 'params.csv'],
-//			   'com.pocolifo.jarremapper.reader.tiny.Tiny1MappingReader/.read(\"official\", \"named\")/fabric+legacyfabric': ['mappings.tiny'],
-//			   'com.pocolifo.jarremapper.reader.tiny.Tiny2MappingReader/.read(\"official\", \"named\")/fabric+legacyfabric': ['mappings-merged.tiny']]
-//
-//	// remapping engines to generate tests for.
-//	// format: <canonical name of engine>/<how to obtain an AbstractRemappingEngine>
-//	engines = [
-//            // all StandardRemappingEngine options
-//			'com.pocolifo.jarremapper.engine.standard.StandardRemappingEngine/new StandardRemappingEngine()',
-//			'com.pocolifo.jarremapper.engine.standard.StandardRemappingEngine/new StandardRemappingEngine().excludeMetaInf()',
-//			'com.pocolifo.jarremapper.engine.standard.StandardRemappingEngine/new StandardRemappingEngine().setRemappingPlugin(new com.pocolifo.jarremapper.SimpleProgressListener())',
-//			'com.pocolifo.jarremapper.engine.standard.StandardRemappingEngine/new StandardRemappingEngine().setRemappingPlugin(new com.pocolifo.jarremapper.SimpleProgressListener()).excludeMetaInf()'
-//	]
-//}
-
 publishing {
 	publications {
 		maven(MavenPublication) {