fenix/Simple-Thank-You
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Thank-You.git synced 2025-06-05 22:09:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons, gradle, Android Studio etc

Browse Source
This commit is contained in:
tibbi
2017-11-28 19:08:48 +01:00
parent a0a10d104f
commit 935d7d17b0
5 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/build.gradle
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.thankyou" applicationId "com.simplemobiletools.thankyou"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 27
versionCode 3 versionCode 3
versionName "2.1.0" versionName "2.1.0"
setProperty("archivesBaseName", "thank-you")
} }
signingConfigs { signingConfigs {
@@ -37,23 +38,10 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.36.0' compile 'com.simplemobiletools:commons:2.41.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
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))

2
app/src/main/kotlin/com/simplemobiletools/thankyou/extensions/Context.kt
View File

@@ -3,4 +3,4 @@ package com.simplemobiletools.thankyou.extensions
import android.content.Context import android.content.Context
import com.simplemobiletools.thankyou.helpers.Config import com.simplemobiletools.thankyou.helpers.Config
val Context.config: Config get() = Config.newInstance(this) val Context.config: Config get() = Config.newInstance(applicationContext)

4
app/src/main/res/values/style.xml
View File

@@ -1,7 +1,5 @@
<resources> <resources>
<style name="AppTheme" parent="AppTheme.Base"> <style name="AppTheme" parent="AppTheme.Base"/>
</style>
</resources> </resources>

9
build.gradle
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.1.61'
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" }
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Oct 26 17:27:58 CEST 2017 #Tue Nov 28 19:02: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