updating Commons, gradle, kotlin etc

This commit is contained in:
tibbi 2017-11-29 21:34:46 +01:00
parent c77f494764
commit 8c4df635e9
5 changed files with 27 additions and 35 deletions

View File

@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 26 compileSdkVersion 27
buildToolsVersion '26.0.2' buildToolsVersion '27.0.1'
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.calculator" applicationId "com.simplemobiletools.calculator"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 27
versionCode 13 versionCode 13
versionName "2.0.0" versionName "2.0.0"
setProperty("archivesBaseName", "calculator")
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
@ -39,32 +40,19 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.35.6' implementation 'com.simplemobiletools:commons:3.0.0'
compile 'me.grantland:autofittextview:0.2.1' implementation 'me.grantland:autofittextview:0.2.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.5.1' testImplementation 'org.robolectric:robolectric:3.5.1'
androidTestCompile 'com.android.support:support-annotations:26.0.2' androidTestImplementation 'com.android.support:support-annotations:27.0.1'
androidTestCompile 'com.android.support.test:runner:0.5' androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestCompile 'com.android.support.test:rules:0.5' androidTestImplementation 'com.android.support.test:rules:1.0.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
} }
buildscript { Properties props = new Properties()
ext.kotlin_version = '1.1.51'
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
}
}
def Properties props = new Properties()
def propFile = new File('signing.properties') def propFile = new File('signing.properties')
if (propFile.canRead()) { if (propFile.canRead()) {
props.load(new FileInputStream(propFile)) props.load(new FileInputStream(propFile))

View File

@ -2,7 +2,8 @@
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.calculator"> package="com.simplemobiletools.calculator"
android:installLocation="auto">
<uses-permission <uses-permission
android:name="android.permission.USE_FINGERPRINT" android:name="android.permission.USE_FINGERPRINT"

View File

@ -1,12 +1,10 @@
package com.simplemobiletools.calculator.activities package com.simplemobiletools.calculator.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSplashActivity
import android.support.v7.app.AppCompatActivity
class SplashActivity : AppCompatActivity() { class SplashActivity : BaseSplashActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun initActivity() {
super.onCreate(savedInstanceState)
startActivity(Intent(this, MainActivity::class.java)) startActivity(Intent(this, MainActivity::class.java))
finish() finish()
} }

View File

@ -1,11 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.0'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,8 +20,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
} }
} }

View File

@ -1,6 +1,6 @@
#Wed Apr 19 17:06:38 MSK 2017 #Wed Nov 29 21:23:30 CET 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip