Skip to content
This repository has been archived by the owner on Nov 13, 2021. It is now read-only.

Commit

Permalink
Updated Code Styles and Copyright for Android Studio 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
leinardi committed Feb 4, 2018
1 parent 2ab3979 commit b24b915
Show file tree
Hide file tree
Showing 10 changed files with 268 additions and 21 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ captures/
.idea/*
!.idea/codeStyleSettings.xml
!.idea/checkstyle-idea.xml
!/.idea/copyright/
!.idea/copyright/
!.idea/codeStyles/

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
Expand Down
9 changes: 5 additions & 4 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

247 changes: 247 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/copyright/Apache_2_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.leinardi.android.things.driver.epaperdriverhat;

import android.graphics.Color;

import com.google.android.things.pio.Gpio;
import com.google.android.things.pio.PeripheralManagerService;
import com.google.android.things.pio.SpiDevice;
Expand Down Expand Up @@ -134,12 +132,12 @@ public void reset() throws IOException {
}

/**
* @return the width of the display
* Get the width of the display
*/
public abstract int getDisplayWidth();

/**
* @return the height of the display
* Get the height of the display
*/
public abstract int getDisplayHeight();

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
6 changes: 3 additions & 3 deletions versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
ext.deps = [:]
def versions = [:]
versions.android_checkstyle_plugin = "1.0.0"
versions.android_gradle_plugin = "3.0.1"
versions.android_gradle_plugin = "3.1.0-beta1"
versions.androidthings = "0.6-devpreview"
versions.apache_commons = "2.5"
versions.arch = hasProperty("ARCH_VERSION") ? getProperty("ARCH_VERSION") : "1.0.0"
Expand Down Expand Up @@ -164,8 +164,8 @@ ext.deps = deps

def build_versions = [:]
build_versions.min_sdk = 26
build_versions.target_sdk = 26
build_versions.build_tools = "26.0.2"
build_versions.target_sdk = 27
build_versions.build_tools = "27.0.3"
build_versions.java_version = JavaVersion.VERSION_1_7
build_versions.version_code = 'git rev-list --count HEAD'.execute().text.trim() as int
ext.build_versions = build_versions
Expand Down

0 comments on commit b24b915

Please sign in to comment.