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

Switch to 182 platform

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-02 18:17:06 +03:00
parent a8b9393e79
commit 0103c0d2fd
417 changed files with 793 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android.configure
import com.android.tools.idea.gradle.project.model.JavaModuleModel
import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys
import com.android.tools.idea.gradle.util.FilePaths
import com.android.tools.idea.io.FilePaths
import com.intellij.openapi.externalSystem.model.DataNode
import com.intellij.openapi.externalSystem.model.project.ModuleData
import com.intellij.openapi.externalSystem.model.project.ProjectData
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.182 → idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleLibraryDataService.kt.181
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android.configure
import com.android.tools.idea.gradle.project.model.JavaModuleModel
import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys
import com.android.tools.idea.io.FilePaths
import com.android.tools.idea.gradle.util.FilePaths
import com.intellij.openapi.externalSystem.model.DataNode
import com.intellij.openapi.externalSystem.model.project.ModuleData
import com.intellij.openapi.externalSystem.model.project.ProjectData
idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
+1 -1
View File
@@ -121,7 +121,7 @@ public abstract class AndroidTestCase extends AndroidTestBase {
Module additionalModule = data.myModuleFixtureBuilder.getFixture().getModule();
myAdditionalModules.add(additionalModule);
AndroidFacet facet = addAndroidFacet(additionalModule);
facet.setProjectType(data.myProjectType);
facet.getProperties().PROJECT_TYPE = data.myProjectType;
String rootPath = getAdditionalModulePath(data.myDirName);
myFixture.copyDirectoryToProject(getResDir(), rootPath + "/res");
myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, rootPath + '/' + SdkConstants.FN_ANDROID_MANIFEST_XML);
idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.182 → idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java.181
+1 -1
View File
@@ -121,7 +121,7 @@ public abstract class AndroidTestCase extends AndroidTestBase {
Module additionalModule = data.myModuleFixtureBuilder.getFixture().getModule();
myAdditionalModules.add(additionalModule);
AndroidFacet facet = addAndroidFacet(additionalModule);
facet.getProperties().PROJECT_TYPE = data.myProjectType;
facet.setProjectType(data.myProjectType);
String rootPath = getAdditionalModulePath(data.myDirName);
myFixture.copyDirectoryToProject(getResDir(), rootPath + "/res");
myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, rootPath + '/' + SdkConstants.FN_ANDROID_MANIFEST_XML);
idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java
+3 -4
View File
@@ -17,8 +17,7 @@
package org.jetbrains.kotlin.android;
import com.android.annotations.NonNull;
import com.intellij.openapi.application.PathManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.io.File;
@@ -28,12 +27,12 @@ import java.io.File;
* stabbed to minimize changes in AndroidTestBase
*/
public class TestUtils {
@NonNull
@NotNull
public static File getSdk() {
return KotlinTestUtils.findAndroidSdk();
}
@NonNull
@NotNull
public static String getLatestAndroidPlatform() {
return "android-26";
}
idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.182 → idea/idea-android/tests/org/jetbrains/kotlin/android/TestUtils.java.181
+4 -3
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.android;
import org.jetbrains.annotations.NotNull;
import com.android.annotations.NonNull;
import com.intellij.openapi.application.PathManager;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.io.File;
@@ -27,12 +28,12 @@ import java.io.File;
* stabbed to minimize changes in AndroidTestBase
*/
public class TestUtils {
@NotNull
@NonNull
public static File getSdk() {
return KotlinTestUtils.findAndroidSdk();
}
@NotNull
@NonNull
public static String getLatestAndroidPlatform() {
return "android-26";
}