Update android-mixed-java-kotlin-project

gradle/android-mixed-java-kotlin-project/.gitignore

@@ -1,5 +1,7 @@
-build
-.gradle
-.idea
 *.iml
-local.properties
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures

gradle/android-mixed-java-kotlin-project/app/build.gradle

@@ -0,0 +1,42 @@
+buildscript {
+    ext.kotlin_version = '1.0.0-beta-1038'
+
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
+
+    defaultConfig {
+        applicationId "com.example.dagger.kotlin"
+        minSdkVersion 14
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}

gradle/android-mixed-java-kotlin-project/AndroidSample/src/main/AndroidManifest.xml → gradle/android-mixed-java-kotlin-project/app/src/main/AndroidManifest.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jetbrains.kotlin.gradle.androidsample"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    package="org.example.kotlin.mixed" >
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+
         <activity
-            android:name="org.jetbrains.kotlin.gradle.androidsample.MainActivity"
+            android:name=".JavaActivity"
             android:label="@string/title_activity_main_activity1" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name="org.jetbrains.kotlin.gradle.androidsample.MainActivity2"
-            android:label="@string/title_activity_main_activity2" >
-        </activity>
+            android:name=".KotlinActivity"
+            android:label="@string/title_activity_main_activity2" />
+
     </application>
 
 </manifest>

gradle/android-mixed-java-kotlin-project/build.gradle

@@ -1 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.3.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

gradle/android-mixed-java-kotlin-project/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 05 20:30:27 MSK 2015
+#Tue Oct 27 23:02:55 MSK 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip

gradle/android-mixed-java-kotlin-project/settings.gradle

@@ -1 +1 @@
-include ':AndroidSample'
+include ':app'