Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Update Kotlin example #2029

Merged
dodgex merged 2 commits into from
Jul 30, 2017
Merged

Update Kotlin example #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d641137
Update Kotlin example
WonderCsabo Jul 26, 2017
1cce92e
Update versions in Gradle example project
WonderCsabo Jul 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android:
- tools # https://github.com/travis-ci/travis-ci/issues/6059
- platform-tools
- android-25
- build-tools-25.0.2
- build-tools-26.0.0

before_script:
- export TERM=dumb
Expand Down
10 changes: 5 additions & 5 deletions 10 examples/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
// replace with the current version of the Android plugin
classpath "com.android.tools.build:gradle:2.3.0"
classpath "com.android.tools.build:gradle:2.3.3"
}
}

repositories {
mavenCentral()
mavenLocal()
mavenCentral()
}

apply plugin: "com.android.application"
Expand All @@ -23,7 +23,7 @@ dependencies {

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "26.0.0"

defaultConfig {
minSdkVersion 9
Expand All @@ -32,7 +32,7 @@ android {
// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
//javaCompileOptions {
// annotationProcessorOptions {
// arguments = ['resourcePackageName': android.defaultConfig.applicationId]
// arguments = ['resourcePackageName': "org.androidannotations.sample"]
// }
//}
}
Expand Down
2 changes: 1 addition & 1 deletion 2 examples/gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
15 changes: 8 additions & 7 deletions 15 examples/kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = "1.1.0"
ext.kotlin_version = "1.1.3-2"

repositories {
jcenter()
Expand All @@ -22,7 +22,7 @@ apply plugin: "kotlin-kapt"

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "26.0.0"

defaultConfig {
minSdkVersion 9
Expand All @@ -33,11 +33,12 @@ android {
}
}

kapt {
arguments {
arg("androidManifestFile", variant.outputs[0].processResourcesTask.manifestFile)
}
}
// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
//kapt {
// arguments {
// arg("resourcePackageName", "org.androidannotations.gradle")
// }
//}

def AAVersion = "4.4.0-SNAPSHOT" // change this to your desired version, for example the latest stable: 4.3.1

Expand Down
2 changes: 1 addition & 1 deletion 2 examples/kotlin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
Morty Proxy This is a proxified and sanitized view of the page, visit original site.