diff --git a/thrifty-gradle-plugin/src/test/kotlin/com/microsoft/thrifty/gradle/ThriftyGradlePluginTest.kt b/thrifty-gradle-plugin/src/test/kotlin/com/microsoft/thrifty/gradle/ThriftyGradlePluginTest.kt
index f80f71aa5..cc19751e4 100644
--- a/thrifty-gradle-plugin/src/test/kotlin/com/microsoft/thrifty/gradle/ThriftyGradlePluginTest.kt
+++ b/thrifty-gradle-plugin/src/test/kotlin/com/microsoft/thrifty/gradle/ThriftyGradlePluginTest.kt
@@ -80,6 +80,10 @@ class ThriftyGradlePluginTest {
runner.buildFixture("kotlin_project_with_include_path") { build() }
}
+ @Test fun `android java project with java thrifts`() {
+ runner.buildFixture("android_java_project_java_thrifts") { build() }
+ }
+
private fun GradleRunner.buildFixture(fixtureName: String, buildAndAssert: GradleRunner.() -> BuildResult): BuildResult {
val fixture = File(fixturesDir, fixtureName)
val settings = File(fixture, "settings.gradle")
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/.gitignore b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/build.gradle b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/build.gradle
new file mode 100644
index 000000000..984b1c19c
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/build.gradle
@@ -0,0 +1,40 @@
+apply plugin: 'com.android.application'
+
+thrifty {
+ kotlin {}
+}
+
+android {
+ compileSdkVersion 29
+ buildToolsVersion "29.0.3"
+
+ defaultConfig {
+ applicationId "com.microsoft.thrifty.droid"
+ minSdkVersion 23
+ targetSdkVersion 29
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ implementation fileTree(dir: "libs", include: ["*.jar"])
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.navigation:navigation-fragment:2.1.0'
+ implementation 'androidx.navigation:navigation-ui:2.1.0'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+}
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/proguard-rules.pro b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/androidTest/java/com/microsoft/thrifty/ExampleInstrumentedTest.java b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/androidTest/java/com/microsoft/thrifty/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..4302f3c61
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/androidTest/java/com/microsoft/thrifty/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.microsoft.thrifty;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ assertEquals("com.microsoft.thrifty.droid", appContext.getPackageName());
+ }
+}
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/AndroidManifest.xml b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..002cde3f7
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/FirstFragment.java b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/FirstFragment.java
new file mode 100644
index 000000000..cb4340693
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/FirstFragment.java
@@ -0,0 +1,34 @@
+package com.microsoft.thrifty;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.fragment.NavHostFragment;
+
+public class FirstFragment extends Fragment {
+
+ @Override
+ public View onCreateView(
+ LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState
+ ) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_first, container, false);
+ }
+
+ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ view.findViewById(R.id.button_first).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ NavHostFragment.findNavController(FirstFragment.this)
+ .navigate(R.id.action_FirstFragment_to_SecondFragment);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/MainActivity.java b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/MainActivity.java
new file mode 100644
index 000000000..bb6793a76
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/MainActivity.java
@@ -0,0 +1,56 @@
+package com.microsoft.thrifty;
+
+import android.os.Bundle;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.view.View;
+
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ FloatingActionButton fab = findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+ });
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.menu_main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/SecondFragment.java b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/SecondFragment.java
new file mode 100644
index 000000000..72babfc2a
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/java/com/microsoft/thrifty/SecondFragment.java
@@ -0,0 +1,34 @@
+package com.microsoft.thrifty;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.fragment.NavHostFragment;
+
+public class SecondFragment extends Fragment {
+
+ @Override
+ public View onCreateView(
+ LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState
+ ) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_second, container, false);
+ }
+
+ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ view.findViewById(R.id.button_second).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ NavHostFragment.findNavController(SecondFragment.this)
+ .navigate(R.id.action_SecondFragment_to_FirstFragment);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..2b068d114
--- /dev/null
+++ b/thrifty-gradle-plugin/src/test/projects/android_java_project_java_thrifts/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+