Browse Source

updated to JDK11, Android SDK 29

yattoz 2 years ago
parent
commit
37bc8867ab
5 changed files with 41 additions and 4 deletions
  1. 6 0
      .idea/compiler.xml
  2. 2 1
      .idea/gradle.xml
  3. 30 0
      .idea/jarRepositories.xml
  4. 1 1
      .idea/misc.xml
  5. 2 2
      build.gradle

+ 6 - 0
.idea/compiler.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="CompilerConfiguration">
4
+    <bytecodeTargetLevel target="11" />
5
+  </component>
6
+</project>

+ 2 - 1
.idea/gradle.xml View File

@@ -1,8 +1,10 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
+  <component name="GradleMigrationSettings" migrationVersion="1" />
3 4
   <component name="GradleSettings">
4 5
     <option name="linkedExternalProjectsSettings">
5 6
       <GradleProjectSettings>
7
+        <option name="testRunner" value="GRADLE" />
6 8
         <option name="distributionType" value="DEFAULT_WRAPPED" />
7 9
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
8 10
         <option name="modules">
@@ -12,7 +14,6 @@
12 14
           </set>
13 15
         </option>
14 16
         <option name="resolveModulePerSourceSet" value="false" />
15
-        <option name="testRunner" value="PLATFORM" />
16 17
       </GradleProjectSettings>
17 18
     </option>
18 19
   </component>

+ 30 - 0
.idea/jarRepositories.xml View File

@@ -0,0 +1,30 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="RemoteRepositoriesConfiguration">
4
+    <remote-repository>
5
+      <option name="id" value="central" />
6
+      <option name="name" value="Maven Central repository" />
7
+      <option name="url" value="https://repo1.maven.org/maven2" />
8
+    </remote-repository>
9
+    <remote-repository>
10
+      <option name="id" value="jboss.community" />
11
+      <option name="name" value="JBoss Community repository" />
12
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
13
+    </remote-repository>
14
+    <remote-repository>
15
+      <option name="id" value="BintrayJCenter" />
16
+      <option name="name" value="BintrayJCenter" />
17
+      <option name="url" value="https://jcenter.bintray.com/" />
18
+    </remote-repository>
19
+    <remote-repository>
20
+      <option name="id" value="maven" />
21
+      <option name="name" value="maven" />
22
+      <option name="url" value="https://jitpack.io" />
23
+    </remote-repository>
24
+    <remote-repository>
25
+      <option name="id" value="Google" />
26
+      <option name="name" value="Google" />
27
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
28
+    </remote-repository>
29
+  </component>
30
+</project>

+ 1 - 1
.idea/misc.xml View File

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
3
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
4 4
     <output url="file://$PROJECT_DIR$/build/classes" />
5 5
   </component>
6 6
   <component name="ProjectType">

+ 2 - 2
build.gradle View File

@@ -190,8 +190,8 @@ ext.deps = deps
190 190
 
191 191
 def build_versions = [:]
192 192
 build_versions.min_sdk = 14
193
-build_versions.target_sdk = 28
194
-build_versions.build_tools = "28.0.3"
193
+build_versions.target_sdk = 29
194
+build_versions.build_tools = "29.0.2"
195 195
 ext.build_versions = build_versions
196 196
 
197 197
 def work = [:]