Upgrade Android SDK lib we compile against to 30 (#6273)

libgdx · Dec 12, 2020 · 9cd2a0b · 9cd2a0b
1 parent 2bd6b74
commit 9cd2a0b
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/backends/gdx-backend-android/.classpath b/backends/gdx-backend-android/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/gdx"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="libs/android-9.0.jar"/>
+	<classpathentry kind="lib" path="libs/android-30.jar"/>
 	<classpathentry kind="lib" path="libs/activity-1.1.0.jar"/>
 	<classpathentry kind="lib" path="libs/core-1.2.0.jar"/>
 	<classpathentry kind="lib" path="libs/fragment-1.2.3.jar"/>

diff --git a/backends/gdx-backend-android/libs/android-30.jar b/backends/gdx-backend-android/libs/android-30.jar
diff --git a/backends/gdx-backend-android/libs/android-9.0.jar b/backends/gdx-backend-android/libs/android-9.0.jar
diff --git a/backends/gdx-backend-android/pom.xml b/backends/gdx-backend-android/pom.xml
@@ -24,7 +24,7 @@
       <artifactId>android</artifactId>
       <version>${android.version}</version>
       <scope>system</scope>
-      <systemPath>${basedir}/libs/android-9.0.jar</systemPath>
+      <systemPath>${basedir}/libs/android-30.jar</systemPath>
       <optional>true</optional>
     </dependency>
 

diff --git a/build.xml b/build.xml
@@ -238,7 +238,7 @@
 			<pathelement location="${distDir}/gdx.jar"/>
 			<pathelement location="${distDir}/gdx-backend-android.jar"/>
 			<pathelement location="${distDir}/extensions/gdx-controllers/gdx-controllers.jar"/>
-			<pathelement location="${basedir}/backends/gdx-backend-android/libs/android-9.0.jar"/>
+			<pathelement location="${basedir}/backends/gdx-backend-android/libs/android-30.jar"/>
 		</path>
 		<ant antfile="../../../build-template.xml" dir="extensions/gdx-controllers/gdx-controllers-android">
 			<property name="distDir" value="${distDir}/extensions/gdx-controllers"/>

diff --git a/extensions/gdx-controllers/gdx-controllers-android/.classpath b/extensions/gdx-controllers/gdx-controllers-android/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-android"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers"/>
-	<classpathentry kind="lib" path="/gdx-backend-android/libs/android-9.0.jar"/>
+	<classpathentry kind="lib" path="/gdx-backend-android/libs/android-30.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/extensions/gdx-controllers/gdx-controllers-android/pom.xml b/extensions/gdx-controllers/gdx-controllers-android/pom.xml
@@ -33,7 +33,7 @@
 			<artifactId>android</artifactId>
 			<version>${android.version}</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/../../../backends/gdx-backend-android/libs/android-9.0.jar</systemPath>
+			<systemPath>${basedir}/../../../backends/gdx-backend-android/libs/android-30.jar</systemPath>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <android.version>9.0</android.version>
+    <android.version>30</android.version>
     <gwt.version>2.8.2</gwt.version>
     <lwjgl.version>2.9.3</lwjgl.version>
     <lwjgl3.version>3.2.3</lwjgl3.version>

diff --git a/tests/gdx-tests-android/.classpath b/tests/gdx-tests-android/.classpath
@@ -13,7 +13,7 @@
 <!-- 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> -->
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/activity-1.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/android-9.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/android-30.jar"/>
 	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/core-1.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/fragment-1.2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="/gdx-backend-android/libs/lifecycle-common-2.2.0.jar"/>