Skip to content

Commit

Permalink
Merge pull request #3 from ken-kentan/androidx
Browse files Browse the repository at this point in the history
Refactor with androidx
  • Loading branch information
ken-kentan committed Oct 14, 2018
2 parents 4ad89d3 + f1fe43a commit 21dd561
Show file tree
Hide file tree
Showing 262 changed files with 9,555 additions and 9,303 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/caches/build_file_checksums.ser
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild

colorpicker/
licenses.html
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
67 changes: 28 additions & 39 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,47 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'com.cookpad.android.licensetools'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "jp.kentan.student_portal_plus"
minSdkVersion 19
targetSdkVersion 27
minSdkVersion 18
targetSdkVersion 28
versionCode 21
versionName "2.0.0-alpha"
versionName "2.0.0"
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
shrinkResources true
minifyEnabled true
shrinkResources true
zipAlignEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
lintOptions {
disable 'GoogleAppIndexingWarning'
baseline file("lint-baseline.xml")
}
dataBinding {
enabled = true
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// Android Support
implementation "com.android.support:support-v4:$support_version"
implementation "com.android.support:appcompat-v7:$support_version"
implementation "com.android.support:cardview-v7:$support_version"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "com.android.support:design:$support_version"
implementation "com.android.support:support-vector-drawable:$support_version"
implementation "com.android.support:customtabs:$support_version"

// DataBinding
kapt 'com.android.databinding:compiler:3.1.4'
implementation fileTree(dir: 'libs', include: ['*.jar'])

// Android Jetpack
implementation 'androidx.core:core-ktx:0.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.core:core-ktx:1.0.0'

// Architecture Components
implementation 'android.arch.lifecycle:extensions:1.1.1'
// Android Architecture Components
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

implementation 'android.arch.work:work-runtime-ktx:1.0.0-alpha08'
// WorkManager
implementation 'android.arch.work:work-runtime-ktx:1.0.0-alpha10'

// Google Dagger
def dagger_version = '2.16'
Expand All @@ -64,25 +55,23 @@ dependencies {
kapt "com.google.dagger:dagger-compiler:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"

// Anko
def anko_version = '0.10.5'
implementation "org.jetbrains.anko:anko:$anko_version"
implementation "org.jetbrains.anko:anko-design:$anko_version"

// OkHttp
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'

// jsoup
implementation 'org.jsoup:jsoup:1.11.2'
implementation 'org.jsoup:jsoup:1.11.3'

// Anko
implementation 'org.jetbrains.anko:anko-sqlite:0.10.6'

// ColorPicker
implementation project(':colorpicker')

// for Test
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

androidTestImplementation 'androidx.test:runner:1.1.0-beta01'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta01'
}
kotlin {
experimental {
Expand Down
Loading

0 comments on commit 21dd561

Please sign in to comment.