marauroa-client-only.jar no longer used

arianne · Nov 7, 2023 · 34b84d0 · 34b84d0
1 parent e4b39bb
commit 34b84d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -75,5 +75,5 @@ dependencies {
 	//testImplementation 'junit:junit:4.+'
 	//androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	//androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-	implementation files('../../libs/marauroa-client-only.jar')
+	implementation files('../../libs/marauroa.jar')
 }
diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml
@@ -245,7 +245,6 @@
     <path id="serverclasspathlist">
       <fileset dir="libs">
         <include name="**/*.jar" />
-        <exclude name="**/marauroa-client-only.jar" />
       </fileset>
     </path>
 
@@ -381,9 +380,7 @@
     <copy todir="${buildroot}/stendhal-server-${version}" file="runserver.sh"/>
     <copy todir="${buildroot}/stendhal-server-${version}" file="runserver.bat"/>
     <copy todir="${buildroot}/stendhal-server-${version}/libs">
-      <fileset dir="libs">
-        <exclude name="marauroa-client-only.jar"/>
-      </fileset>
+      <fileset dir="libs"/>
     </copy>
     <copy todir="${buildroot}/stendhal-server-${version}/doc">
       <fileset dir="doc"/>

diff --git a/libs/marauroa-client-only.jar b/libs/marauroa-client-only.jar