zhanghaochen / ParentControl

Download as
Browse Code »

Commit 3c7e91f31a70be1c8c26f5b6780283022c6a8b2b

Authored by shixianjie
1 parent 5cc69290e4
Exists in master

编译通过

Showing 5 changed files with 18 additions and 8 deletions   Show diff stats
... ... @@ -0,0 +1 @@
  1 +parent
0 2 \ No newline at end of file
... ...
... ... @@ -5,7 +5,7 @@
5 5 <option name="linkedExternalProjectsSettings">
6 6 <GradleProjectSettings>
7 7 <option name="externalProjectPath" value="$PROJECT_DIR$" />
8   - <option name="gradleJvm" value="#JAVA_HOME" />
  8 + <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
9 9 <option name="modules">
10 10 <set>
11 11 <option value="$PROJECT_DIR$" />
... ...
.idea/migrations.xml
Diff comments   View file @3c7e91f
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ProjectMigrations">
  4 + <option name="MigrateToGradleLocalJavaHome">
  5 + <set>
  6 + <option value="$PROJECT_DIR$" />
  7 + </set>
  8 + </option>
  9 + </component>
  10 +</project>
0 11 \ No newline at end of file
... ...
... ... @@ -42,6 +42,7 @@
42 42 </map>
43 43 </option>
44 44 </component>
  45 + <component name="ExternalStorageConfigurationManager" enabled="true" />
45 46 <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
46 47 <output url="file://$PROJECT_DIR$/build/classes" />
47 48 </component>
... ...
... ... @@ -69,12 +69,11 @@ buildscript {
69 69  
70 70  
71 71 repositories {
72   - google()
73   - jcenter()
74   - maven { url 'https://maven.aliyun.com/repository/jcenter' }
  72 + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
75 73 maven { url 'https://maven.aliyun.com/repository/google' }
76 74 maven { url 'https://maven.aliyun.com/repository/central' }
77   - maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
  75 + google()
  76 + maven { url 'https://maven.aliyun.com/repository/jcenter' }
78 77 }
79 78 dependencies {
80 79 classpath 'com.android.tools.build:gradle:4.2.2'
... ... @@ -92,12 +91,11 @@ buildscript {
92 91  
93 92 allprojects {
94 93 repositories {
95   - google()
96   - jcenter()
97 94 maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
98   - maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
99 95 maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
100 96 maven { url 'https://jitpack.io' }
  97 + google()
  98 + maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
101 99 }
102 100 }
103 101 task clean(type: Delete) {
... ...