azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix android jps build test case

Browse Source 
- add proper way of setting up android sdk for jps
- add missing android plugin runtime library
This commit is contained in:
Mikhail Mutcianko
2014-09-20 23:34:38 +04:00
committed by Yan Zhulanow
parent bf25dffb85
commit 95fd4006d9
7 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/android/simple/AndroidManifest.xml
+2 -2
View File
@@ -4,9 +4,9 @@
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="17"/>
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
<application android:label="app_name" >
<activity android:name=".MyActivity"
android:label="@string/app_name">
android:label="app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
jps-plugin/testData/android/simple/res/layout/main.xml
+1 -1
View File
@@ -8,6 +8,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Hello World, MyActivity"
android:id="@+id/LOL"/>
android:id="@+id/textField"/>
</LinearLayout>
jps-plugin/testData/android/simple/simple.iml
+1 -1
View File
@@ -36,7 +36,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="Androids_SDK" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
</component>
jps-plugin/testData/android/simple/simple.ipr
+1 -1
View File
@@ -11,7 +11,7 @@
<module fileurl="file://$PROJECT_DIR$/simple.iml" filepath="$PROJECT_DIR$/simple.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android_SDK" project-jdk-type="Android SDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 17 Platform" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java
-10
View File
@@ -1,10 +0,0 @@
package com.example.myapp;
/**
* Created by miha on 8/6/14.
*/
public class Foo {
public static void main(String[] args) {
System.out.println(R.id.LOL);
}
}
jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
+1 -8
View File
@@ -4,16 +4,9 @@ import android.app.Activity
import android.os.Bundle
public class MyActivity : Activity() {
/**
* Called when the activity is first created.
*/
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.main)
println(R.id.LOL)
fuck
this.LOL
LOL.setText("UIGFVIYUGFKGYUFOD")
LOL.setText("test")
textField.setText("test")
}
}