Remove Bintray, Remove 1.7.10 (Because dependency error)

.github/workflows/build.yml

@@ -35,14 +35,12 @@ jobs:
         TRAVIS: true
         CURSEFORGE_TOKEN: ${{secrets.curseforge_token}}
         GH_TOKEN: ${{secrets.github_token}}
-        BINTRAY_USER: ${{secrets.bintray_user}}
-        BINTRAY_KEY: ${{secrets.bintray_key}}
       run: |
         export TRAVIS_TAG=$(bash -c "if [[ ${GITHUB_REF} == refs/tags/* ]] ; then echo ${GITHUB_REF##*/} ; else echo ; fi")
         export TRAVIS_BUILD_NUMBER=${BUILD_NUMBER}
         chmod a+x ./gradlew
         ./gradlew clean setupCIWorkspace --continue
-        ./gradlew build githubRelease curseforge bintrayUpload publish --continue
+        ./gradlew build githubRelease curseforge publish --continue
     - name: Archive production artifacts
       uses: actions/upload-artifact@v1
       with:

.travis.yml

@@ -11,9 +11,8 @@ before_install:
 install: "./gradlew setupCIWorkspace --continue"
 script: "./gradlew build --continue"
 after_success:
-  - ./gradlew githubRelease curseforge bintrayUpload --continue
+  - ./gradlew githubRelease curseforge --continue
   #- ./gradlew githubRelease --continue
-  #- ./gradlew bintrayUpload --continue
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

build.gradle

@@ -2,7 +2,6 @@
 buildscript {
 	repositories {
 		mavenCentral()
-		jcenter()
 	}
 
 	dependencies {
@@ -18,7 +17,6 @@ buildscript {
 plugins {
 	id 'com.palantir.git-version' version '0.7.1'
 	id 'co.riiid.gradle' version '0.4.2'
-	id 'com.jfrog.bintray' version '1.8.4'
 }
 
 // Configure Utility
@@ -161,8 +159,6 @@ ext {
 	sec_curseforge_key = System.getenv('CURSEFORGE_TOKEN') ?: project.isProperty('api_key_curseforge') ? project.api_key_curseforge : null
 	sec_github_user = System.getenv('GITHUB_ACTOR') ?: project.isProperty('api_user_github') ? project.api_user_github : null
 	sec_github_key = System.getenv('GH_TOKEN') ?: project.isProperty('api_key_github') ? project.api_key_github : null
-	sec_bintray_user = System.getenv('BINTRAY_USER') ?: project.isProperty('api_user_bintray') ? project.api_user_bintray : null
-	sec_bintray_key = System.getenv('BINTRAY_KEY') ?: project.isProperty('api_key_bintray') ? project.api_key_github : null
 }
 
 // Configure Subprojects
@@ -229,32 +225,3 @@ publishing {
 		}
 	}
 }
-
-// Release Bintray
-if (sec_bintray_user!=null&&sec_bintray_key!=null&&project.isProperty('extra_bintray_repo')&&project.isProperty('extra_bintray_name')) {
-	bintray {
-		tasks.bintrayUpload.enabled = !mod_autorelease
-		project(':versions').subprojects.each { tasks.githubRelease.dependsOn(it.tasks.findByName('build')) }
-		user = sec_bintray_user
-		key = sec_bintray_key
-		def pubs = ['ModPublication']
-		project(':versions').subprojects {
-			pubs += "ModPublication-${project.version_minecraft}"
-		}
-		publications = pubs
-
-		publish = true
-		pkg {
-			userOrg = project.extra_bintray_org
-			repo = project.extra_bintray_repo
-			name = project.extra_bintray_name
-			version {
-				name = "${mod_version}"
-				released = new Date()
-				desc = "${mod_changelog_title}"+(StringUtils.isEmpty(mod_changelog)?'':"\n\n${mod_changelog}")
-				vcsTag = mod_buildtag
-			}
-		}
-	}
-} else
-	tasks.bintrayUpload.enabled = false

settings.gradle

@@ -1,6 +1,6 @@
 rootProject.name = 'Emojicord'
 include ':shared', ':versions'
-include ':versions:1.7.10', ':versions:1.10.2', ':versions:1.12.2', ':versions:1.14.4', ':versions:1.15.2', ':versions:1.16.1'
+include /*':versions:1.7.10',*/ ':versions:1.10.2', ':versions:1.12.2', ':versions:1.14.4', ':versions:1.15.2', ':versions:1.16.1'
 project(':versions').children.each { project ->
     project.buildFileName = '../build.subprojects.gradle'
 }

shared/src/main/resources/META-INF/mods.toml

@@ -2,6 +2,7 @@ modLoader="javafml"
 loaderVersion="[13,)"
 issueTrackerURL="https://github.com/Team-Fruit/Emojicord/issues?q=is%3Aissue"
 logoFile="logo.png"
+license="MIT"
 
 [[mods]]
     modId="emojicord"

shared/src/main/resources/mcmod.info

@@ -10,6 +10,7 @@
 			],
 			"credits": "2019 TeamFruit",
 			"logoFile": "logo.png",
+			"license": "MIT",
 			"screenshots": [],
 			"updateUrl": "https://emojicord.teamfruit.net/download/",
 			"url": "https://emojicord.teamfruit.net/",

versions/1.7.10/gradle.properties

@@ -1,4 +1,4 @@
-forgegradle=net.teamfruit.forgegradle:ForgeGradle:1.2.0.2
+forgegradle=com.anatawa12.forge:ForgeGradle:1.2-1.0.+
 forgegradle_plugin=forge
 version_minecraft=1.7.10
 version_forge=10.13.4.1558-1.7.10

versions/build.subprojects.gradle

@@ -2,11 +2,6 @@
 buildscript {
 	repositories {
 		mavenCentral()
-		jcenter()
-		maven {
-			name = 'Bintray TeamFruit'
-			url = "https://dl.bintray.com/team-fruit/mods/"
-		}
 		maven {
 			name = 'forge'
 			url = 'http://files.minecraftforge.net/maven'
@@ -235,15 +230,10 @@ processResources {
 
 // Dependency Repositories
 repositories {
-	jcenter()
 	maven {
 		name = 'CurseForge'
 		url = 'https://minecraft.curseforge.com/api/maven/'
 	}
-	maven {
-		name = 'Bintray TeamFruit'
-		url = "https://dl.bintray.com/team-fruit/mods/"
-	}
 	maven {
 		name = 'Sonatype'
 		url = 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -256,16 +246,16 @@ dependencies {
 		minecraft "net.minecraftforge:forge:${project.version_minecraft}-${project.version_forge}"
 	}
 
-	// Manifold
-	implementation group: 'systems.manifold', name: 'manifold-all', version: '2020.1.12'
 	testImplementation group: 'junit', name: 'junit', version: '4.12'
 
 	// tools.jar dependency (for Java 8 only), primarily to support structural typing without static proxies.
 	// Thus if you are *not* using structural typing, you **don't** need tools.jar
 	implementation files("${System.properties['java.home']}/../lib/tools.jar")
 
+	// Manifold
 	// Add manifold to -processorpath for javac
-	annotationProcessor group: 'systems.manifold', name: 'manifold-preprocessor', version: '2020.1.12'
+	annotationProcessor 'systems.manifold:manifold-preprocessor:2022.1.21'
+	testAnnotationProcessor 'systems.manifold:manifold-preprocessor:2022.1.21'
 }
 
 // Manifold