Build r8 together with moe

multi-os-engine · Jul 21, 2022 · f740621 · f740621
1 parent bbda371
commit f740621
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -31,8 +31,4 @@ includeFlat 'moe.tools.common'
 includeFlat 'moe.tools.natjgen'
 includeFlat 'moe.tools.classvalidator'
 
-include 'proguard-core', 'proguard', 'proguard:base', 'proguard:app'
-project(':proguard-core').projectDir = new File('../../../external/proguard/proguard-core')
-project(':proguard').projectDir = new File('../../../external/proguard/proguard')
-project(':proguard:base').projectDir = new File('../../../external/proguard/proguard/base')
-project(':proguard:app').projectDir = new File('../../../external/proguard/proguard/proguard-app')
+includeBuild '../../../external/r8'