陶汉栋 / ParentWork

Download as
Browse Code »

Commit 5e12efe887dc32a4c644f6632846d2ef7079c51e

Authored by 陶汉栋
1 parent 54127ffd
Exists in master

no message

Showing 7 changed files with 42 additions and 12 deletions   Show diff stats
.idea/caches/build_file_checksums.ser 0 → 100644
View file @5e12efe
No preview for this file type
.idea/codeStyles/Project.xml 0 → 100644
  Diff comments   View file @5e12efe
... ... @@ -0,0 +1,29 @@
  1 +<component name="ProjectCodeStyleConfiguration">
  2 + <code_scheme name="Project" version="173">
  3 + <Objective-C-extensions>
  4 + <file>
  5 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
  6 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
  7 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
  8 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
  9 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
  10 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
  11 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
  12 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
  13 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
  14 + </file>
  15 + <class>
  16 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
  17 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
  18 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
  19 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
  20 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
  21 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
  22 + </class>
  23 + <extensions>
  24 + <pair source="cpp" header="h" fileNamingConvention="NONE" />
  25 + <pair source="c" header="h" fileNamingConvention="NONE" />
  26 + </extensions>
  27 + </Objective-C-extensions>
  28 + </code_scheme>
  29 +</component>
0 30 \ No newline at end of file
... ...
.idea/misc.xml
  Diff comments   View file @5e12efe
... ... @@ -5,11 +5,12 @@
5 5 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
6 6 <option name="myNullables">
7 7 <value>
8   - <list size="4">
  8 + <list size="5">
9 9 <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
10 10 <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
11   - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
12   - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
  11 + <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
  12 + <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
  13 + <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
13 14 </list>
14 15 </value>
15 16 </option>
... ...
.idea/vcs.xml
  Diff comments   View file @5e12efe
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="VcsDirectoryMappings">
4   - <mapping directory="$PROJECT_DIR$" vcs="Git" />
  4 + <mapping directory="" vcs="Git" />
5 5 </component>
6 6 </project>
7 7 \ No newline at end of file
... ...
app/build.gradle
  Diff comments   View file @5e12efe
1 1 apply plugin: 'com.android.application'
2 2  
3 3 android {
4   - compileSdkVersion 26
  4 + compileSdkVersion 27
5 5 defaultConfig {
6 6 applicationId "com.shunzhi.parent"
7 7 minSdkVersion 16
8   - targetSdkVersion 26
  8 + targetSdkVersion 27
9 9 versionCode 1
10 10 versionName "1.0"
11 11 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
... ...
build.gradle
  Diff comments   View file @5e12efe
... ... @@ -7,7 +7,7 @@ buildscript {
7 7 jcenter()
8 8 }
9 9 dependencies {
10   - classpath 'com.android.tools.build:gradle:3.0.1'
  10 + classpath 'com.android.tools.build:gradle:3.1.2'
11 11  
12 12  
13 13 // NOTE: Do not place your application dependencies here; they belong
... ... @@ -29,9 +29,9 @@ task clean(type: Delete) {
29 29 ext {
30 30 // Sdk and tools
31 31 minSdkVersion = 16
32   - targetSdkVersion = 26
33   - compileSdkVersion = 26
34   - buildToolsVersion = '26.0.2'
  32 + targetSdkVersion = 27
  33 + compileSdkVersion = 27
  34 + buildToolsVersion = '27.0.3'
35 35  
36 36 // App dependencies
37 37 supportLibraryVersion = '26.1.0'
... ...
gradle/wrapper/gradle-wrapper.properties
  Diff comments   View file @5e12efe
1   -#Tue Feb 27 14:00:51 CST 2018
  1 +#Wed Jul 18 10:15:28 CST 2018
2 2 distributionBase=GRADLE_USER_HOME
3 3 distributionPath=wrapper/dists
4 4 zipStoreBase=GRADLE_USER_HOME
5 5 zipStorePath=wrapper/dists
6   -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
  6 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
... ...